Merge branch 'master' of http://192.168.0.75:3000/liux/gs_sub_evaluate

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java

@@ -146,6 +146,15 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
                 childList.add(childMap);
             }
         }
+        oneList = oneList.stream().distinct().collect(Collectors.toList());
+        Map<String, Object> upload = new LinkedHashMap<>();
+        upload.put("title", "操作");
+        upload.put("mergeType", "rowspan");
+        upload.put("num", 3);
+        upload.put("minWidth", 100);
+        upload.put("field", "examineAndApprove");
+        oneList.add(upload);
+
         finalList.add(oneList);
         finalList.add(twoList);
         finalList.add(threeList);
@@ -1021,6 +1030,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
         }
         list.add(map);
     }
+
     private void addCollectTitleMap(List<Map<String, Object>> list, String title, String field, int num, int minWidth
             , String countType, String standardScore) {
         Map<String, Object> map = new LinkedHashMap<>();

src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java

@@ -88,6 +88,9 @@ public class PermissionController {
                         }
                     }
                 }
+            });
+            permission.getChild().forEach(cc -> {
+                cc.getChild().forEach(c -> {
                     if (c.getHref().equals("pages/evaluate/team/evaluateCheckList.html")) {
                         for (TeamEvaluateBean teamEvaluateBean : teamEvaluateBeans) {
                             if ("5".equals(loginUser.getRoleId()) ||
@@ -109,6 +112,7 @@ public class PermissionController {
                         }
                     }
                 });
+            });
         }
         return firstLevel;
     }

src/main/resources/static/js/main.js

@@ -2,7 +2,7 @@ initMenu();
 function getIsCheckFun(list) {
     if (list && list.length > 0) {
         list.forEach((e) => {
-            if (e.isCheck == 1) {
+            if (e.isCheck == 1 || e.status == 0) {
                 console.log("有待审数据", e);
                 var elements = document.querySelectorAll(
                     "a[lay-id='" + e.id + "']"