限制演示用户和配置不被删除
This commit is contained in:
@@ -68,8 +68,14 @@ public class ExceptionConstants {
|
|||||||
public static final int USER_OVER_LIMIT_FAILED_CODE = 500004;
|
public static final int USER_OVER_LIMIT_FAILED_CODE = 500004;
|
||||||
public static final String USER_OVER_LIMIT_FAILED_MSG = "用户录入数量超出限制,请联系管理员";
|
public static final String USER_OVER_LIMIT_FAILED_MSG = "用户录入数量超出限制,请联系管理员";
|
||||||
//此用户名限制使用
|
//此用户名限制使用
|
||||||
public static final int USER_NAME_LIMIT_USE_CODE = 500004;
|
public static final int USER_NAME_LIMIT_USE_CODE = 500005;
|
||||||
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 String USER_LIMIT_DELETE_MSG = "抱歉,演示用户不允许删除";
|
||||||
|
//演示用户不允许修改
|
||||||
|
public static final int USER_LIMIT_UPDATE_CODE = 500007;
|
||||||
|
public static final String USER_LIMIT_UPDATE_MSG = "抱歉,演示用户不允许修改";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色信息
|
* 角色信息
|
||||||
|
|||||||
@@ -103,6 +103,8 @@ public class ResourceController {
|
|||||||
int delete = configResourceManager.delete(apiName, id, request);
|
int delete = configResourceManager.delete(apiName, id, request);
|
||||||
if(delete > 0) {
|
if(delete > 0) {
|
||||||
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
|
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
|
||||||
|
} else if(delete == -1) {
|
||||||
|
return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code);
|
||||||
} else {
|
} else {
|
||||||
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
|
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
|
||||||
}
|
}
|
||||||
@@ -115,6 +117,8 @@ public class ResourceController {
|
|||||||
int delete = configResourceManager.deleteBatch(apiName, ids, request);
|
int delete = configResourceManager.deleteBatch(apiName, ids, request);
|
||||||
if(delete > 0) {
|
if(delete > 0) {
|
||||||
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
|
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
|
||||||
|
} else if(delete == -1) {
|
||||||
|
return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code);
|
||||||
} else {
|
} else {
|
||||||
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
|
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ public class SystemConfigService {
|
|||||||
@Resource
|
@Resource
|
||||||
private LogService logService;
|
private LogService logService;
|
||||||
|
|
||||||
|
private static final String TEST_USER = "jsh";
|
||||||
|
|
||||||
public SystemConfig getSystemConfig(long id)throws Exception {
|
public SystemConfig getSystemConfig(long id)throws Exception {
|
||||||
SystemConfig result=null;
|
SystemConfig result=null;
|
||||||
try{
|
try{
|
||||||
@@ -136,7 +138,11 @@ public class SystemConfigService {
|
|||||||
String [] idArray=ids.split(",");
|
String [] idArray=ids.split(",");
|
||||||
int result=0;
|
int result=0;
|
||||||
try{
|
try{
|
||||||
|
if(userService.checkIsTestUser()) {
|
||||||
|
result=-1;
|
||||||
|
} else {
|
||||||
result = systemConfigMapperEx.batchDeleteSystemConfigByIds(new Date(), userInfo == null ? null : userInfo.getId(), idArray);
|
result = systemConfigMapperEx.batchDeleteSystemConfigByIds(new Date(), userInfo == null ? null : userInfo.getId(), idArray);
|
||||||
|
}
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -257,6 +257,12 @@ 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)){
|
||||||
|
logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]",
|
||||||
|
ExceptionConstants.USER_LIMIT_DELETE_CODE,ExceptionConstants.USER_LIMIT_DELETE_MSG,ids);
|
||||||
|
throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_DELETE_CODE,
|
||||||
|
ExceptionConstants.USER_LIMIT_DELETE_MSG);
|
||||||
|
}
|
||||||
sb.append("[").append(user.getLoginName()).append("]");
|
sb.append("[").append(user.getLoginName()).append("]");
|
||||||
}
|
}
|
||||||
logService.insertLog("用户", sb.toString(),
|
logService.insertLog("用户", sb.toString(),
|
||||||
@@ -531,6 +537,12 @@ 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)){
|
||||||
|
logger.error("异常码[{}],异常提示[{}],参数,obj:[{}]",
|
||||||
|
ExceptionConstants.USER_LIMIT_UPDATE_CODE,ExceptionConstants.USER_LIMIT_UPDATE_MSG, TEST_USER);
|
||||||
|
throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_UPDATE_CODE,
|
||||||
|
ExceptionConstants.USER_LIMIT_UPDATE_MSG);
|
||||||
|
}
|
||||||
logService.insertLog("用户",
|
logService.insertLog("用户",
|
||||||
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(),
|
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(),
|
||||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
|
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
|
||||||
|
|||||||
Reference in New Issue
Block a user