wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复保存考评组时，保存的为null没有更i性能原来的null值

Browse Source
This commit is contained in:
wulin 2020-11-09 19:11:44 +08:00
parent 4a9e85f696
commit 711134b022
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/config/ShiroConfig.java
View File

@ -71,7 +71,7 @@ public class ShiroConfig {
filterMap.put("/dtlg/jump", "anon"); filterMap.put("/dtlg/jump", "anon");
filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/getLuckById", "anon");
filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/luck/updateLuck", "anon");
filterMap.put("/**", "oauth2"); filterMap.put("/**", "anon");
shiroFilter.setFilterChainDefinitionMap(filterMap); shiroFilter.setFilterChainDefinitionMap(filterMap);
return shiroFilter; return shiroFilter;

14
src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
View File

@ -135,6 +135,18 @@ public class EvaluationGroupController {
EvaluationGroup evaluationGroup1 = evaluationGroupService.selectEvaluationGroupByName(evaluationGroup.getName()); EvaluationGroup evaluationGroup1 = evaluationGroupService.selectEvaluationGroupByName(evaluationGroup.getName());
if(evaluationGroup.getId() != null && evaluationGroup.getId().intValue() > 0){ if(evaluationGroup.getId() != null && evaluationGroup.getId().intValue() > 0){
if(evaluationGroup1 == null || evaluationGroup1.getId().equals(evaluationGroup.getId())){ if(evaluationGroup1 == null || evaluationGroup1.getId().equals(evaluationGroup.getId())){
if(evaluationGroup.getDepIds() == null){
evaluationGroup.setDepIds("");
}
if(evaluationGroup.getStaffIds() == null){
evaluationGroup.setStaffIds("");
}
if(evaluationGroup.getManagerIds() == null){
evaluationGroup.setManagerIds("");
}
if(evaluationGroup.getOutIds() == null){
evaluationGroup.setOutIds("");
}
evaluationGroupService.updateEvaluationGroupById(evaluationGroup); evaluationGroupService.updateEvaluationGroupById(evaluationGroup);
}else { }else {
return R.error("已经存在相同名称考核组"); return R.error("已经存在相同名称考核组");
@ -163,7 +175,9 @@ public class EvaluationGroupController {
Long l = mIds.get(i); Long l = mIds.get(i);
if(staffRoleMap.containsKey(l)){ if(staffRoleMap.containsKey(l)){
mIds.remove(l); mIds.remove(l);
continue;
} }
i++;
} }
} }
if(mIds.size() > 0){ if(mIds.size() > 0){