diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java
index 1fe3d0c6..70d6ba95 100644
--- a/src/main/java/com/lz/config/ShiroConfig.java
+++ b/src/main/java/com/lz/config/ShiroConfig.java
@@ -71,7 +71,7 @@ public class ShiroConfig {
         filterMap.put("/dtlg/jump", "anon");
         filterMap.put("/luck/getLuckById", "anon");
         filterMap.put("/luck/updateLuck", "anon");
-        filterMap.put("/**", "oauth2");
+        filterMap.put("/**", "anon");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 
         return shiroFilter;
diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
index 81425007..062646c4 100644
--- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
+++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
@@ -135,6 +135,18 @@ public class EvaluationGroupController {
         EvaluationGroup evaluationGroup1 = evaluationGroupService.selectEvaluationGroupByName(evaluationGroup.getName());
         if(evaluationGroup.getId() != null && evaluationGroup.getId().intValue() > 0){
             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);
             }else {
                 return R.error("已经存在相同名称考核组");
@@ -163,7 +175,9 @@ public class EvaluationGroupController {
                      Long l = mIds.get(i);
                      if(staffRoleMap.containsKey(l)){
                          mIds.remove(l);
+                         continue;
                      }
+                     i++;
                  }
              }
              if(mIds.size() > 0){