diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index e058a993..7b8f0aaa 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -436,11 +436,15 @@ public class DepotHeadController { @RequestParam("deleted") String deleted, @RequestParam("updated") String updated, HttpServletRequest request) throws Exception{ JSONObject result = ExceptionConstants.standardSuccess(); - Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString()); - Long count = depotHeadService.countDepotHead(null,null,null,null,null,null); - if(("open").equals(mybatisPlusStatus) && count>= billsNumLimit) { - throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, - ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); + if(("open").equals(mybatisPlusStatus)) { + Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString()); + Long count = depotHeadService.countDepotHead(null,null,null,null,null,null); + if(count>= billsNumLimit) { + throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, + ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); + } else { + depotHeadService.addDepotHeadAndDetail(beanJson,inserted,deleted,updated); + } } else { depotHeadService.addDepotHeadAndDetail(beanJson,inserted,deleted,updated); } diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java index 3973166d..c46660e4 100644 --- a/src/main/java/com/jsh/erp/controller/UserController.java +++ b/src/main/java/com/jsh/erp/controller/UserController.java @@ -323,11 +323,16 @@ public class UserController { @ResponseBody public Object addUser(@RequestParam("info") String beanJson, HttpServletRequest request)throws Exception{ JSONObject result = ExceptionConstants.standardSuccess(); - Long userNumLimit = Long.parseLong(request.getSession().getAttribute("userNumLimit").toString()); - Long count = userService.countUser(null,null); - if(("open").equals(mybatisPlusStatus) && count>= userNumLimit) { - throw new BusinessParamCheckingException(ExceptionConstants.USER_OVER_LIMIT_FAILED_CODE, - ExceptionConstants.USER_OVER_LIMIT_FAILED_MSG); + if(("open").equals(mybatisPlusStatus)) { + Long userNumLimit = Long.parseLong(request.getSession().getAttribute("userNumLimit").toString()); + Long count = userService.countUser(null,null); + if(count>= userNumLimit) { + throw new BusinessParamCheckingException(ExceptionConstants.USER_OVER_LIMIT_FAILED_CODE, + ExceptionConstants.USER_OVER_LIMIT_FAILED_MSG); + } else { + UserEx ue= JSON.parseObject(beanJson, UserEx.class); + userService.addUserAndOrgUserRel(ue); + } } else { UserEx ue= JSON.parseObject(beanJson, UserEx.class); userService.addUserAndOrgUserRel(ue);