diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java index a10df819..d8f887c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java @@ -40,7 +40,7 @@ public class TermBankController extends BaseController { } @GetMapping("/selectTermBankList") - public AjaxResult selectTermBankList(TermBank termBank) { + public AjaxResult selectTermBankList(TermBank termBank) { return AjaxResult.success(termBankService.selectTermBankList(termBank)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java index 7389fde2..3dccd741 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java @@ -66,7 +66,7 @@ public class TermBankServiceImpl implements ITermBankService { if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() < Constants.TERM_MAX_LEVEL) { termBank.setTermLevel(termBank.getTermLevel() + 1); } - if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel().equals(Constants.TERM_MAX_LEVEL)) { + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() > (Constants.TERM_MAX_LEVEL)) { return AjaxResult.error("常用话术层数最大值为" + Constants.TERM_MAX_LEVEL + "层"); } if (Objects.nonNull(termBank) && StringUtils.isBlank(termBank.getParentTermCode())) { @@ -89,7 +89,7 @@ public class TermBankServiceImpl implements ITermBankService { if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() < Constants.TERM_MAX_LEVEL) { termBank.setTermLevel(termBank.getTermLevel() + 1); } - if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel().equals(Constants.TERM_MAX_LEVEL)) { + if (Objects.nonNull(termBank) && Objects.nonNull(termBank.getTermLevel()) && termBank.getTermLevel() > (Constants.TERM_MAX_LEVEL)) { return AjaxResult.error("常用话术层数最大值为" + Constants.TERM_MAX_LEVEL + "层"); } if (Objects.nonNull(termBank) && StringUtils.isBlank(termBank.getParentTermCode())) {