purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化演示用户的删除逻辑

Browse Source
This commit is contained in:
季圣华
2021-06-18 21:23:16 +08:00
parent bcd07444b9
commit a13fcfcd21
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
View File

@@ -72,10 +72,10 @@ public class ExceptionConstants {
public static final String USER_NAME_LIMIT_USE_MSG = "此用户名限制使用"; public static final String USER_NAME_LIMIT_USE_MSG = "此用户名限制使用";
//演示用户不允许删除 //演示用户不允许删除
public static final int USER_LIMIT_DELETE_CODE = 500006; 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 int USER_LIMIT_UPDATE_CODE = 500007;
public static final String USER_LIMIT_UPDATE_MSG = "抱歉，演示用户不允许修改"; public static final String USER_LIMIT_UPDATE_MSG = "抱歉，演示模式下的演示用户不允许修改";
/** /**
* 角色信息 * 角色信息

4
jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -257,7 +257,7 @@ public class UserService {
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<User> list = getUserListByIds(ids); List<User> list = getUserListByIds(ids);
for(User user: list){ for(User user: list){
if(user.getLoginName().equals(TEST_USER)){ if(demonstrateOpen && user.getLoginName().equals(TEST_USER)){
logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]", logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]",
ExceptionConstants.USER_LIMIT_DELETE_CODE,ExceptionConstants.USER_LIMIT_DELETE_MSG,ids); ExceptionConstants.USER_LIMIT_DELETE_CODE,ExceptionConstants.USER_LIMIT_DELETE_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_DELETE_CODE, throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_DELETE_CODE,
@@ -539,7 +539,7 @@ public class UserService {
throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE, throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
ExceptionConstants.USER_NAME_LIMIT_USE_MSG); ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
} else { } else {
if(ue.getLoginName().equals(TEST_USER)){ if(demonstrateOpen && ue.getLoginName().equals(TEST_USER)){
logger.error("异常码[{}],异常提示[{}],参数,obj:[{}]", logger.error("异常码[{}],异常提示[{}],参数,obj:[{}]",
ExceptionConstants.USER_LIMIT_UPDATE_CODE,ExceptionConstants.USER_LIMIT_UPDATE_MSG, TEST_USER); ExceptionConstants.USER_LIMIT_UPDATE_CODE,ExceptionConstants.USER_LIMIT_UPDATE_MSG, TEST_USER);
throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_UPDATE_CODE, throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_UPDATE_CODE,