diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 8ae67f09..5a065edd 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -72,10 +72,10 @@ public class ExceptionConstants { public static final String USER_NAME_LIMIT_USE_MSG = "此用户名限制使用"; //演示用户不允许删除 public static final int USER_LIMIT_DELETE_CODE = 500006; - public static final String USER_LIMIT_DELETE_MSG = "抱歉,演示用户不允许删除"; + public static final String USER_LIMIT_DELETE_MSG = "抱歉,演示模式下的演示用户不允许删除"; //演示用户不允许修改 public static final int USER_LIMIT_UPDATE_CODE = 500007; - public static final String USER_LIMIT_UPDATE_MSG = "抱歉,演示用户不允许修改"; + public static final String USER_LIMIT_UPDATE_MSG = "抱歉,演示模式下的演示用户不允许修改"; /** * 角色信息 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 6b5b77a9..57ea0b27 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -257,7 +257,7 @@ public class UserService { sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); List list = getUserListByIds(ids); for(User user: list){ - if(user.getLoginName().equals(TEST_USER)){ + if(demonstrateOpen && user.getLoginName().equals(TEST_USER)){ logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]", ExceptionConstants.USER_LIMIT_DELETE_CODE,ExceptionConstants.USER_LIMIT_DELETE_MSG,ids); throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_DELETE_CODE, @@ -539,7 +539,7 @@ public class UserService { throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE, ExceptionConstants.USER_NAME_LIMIT_USE_MSG); } else { - if(ue.getLoginName().equals(TEST_USER)){ + if(demonstrateOpen && ue.getLoginName().equals(TEST_USER)){ logger.error("异常码[{}],异常提示[{}],参数,obj:[{}]", ExceptionConstants.USER_LIMIT_UPDATE_CODE,ExceptionConstants.USER_LIMIT_UPDATE_MSG, TEST_USER); throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_UPDATE_CODE,