bug修复

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java

@@ -442,9 +442,9 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
             Collections.sort(deptIdList);
             Collections.sort(postIdList);
             //对两次查询的结果判断是否完全相同
+            int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
+            String evaluateType = o.getEvaluateType();
             if (deptIdList.equals(postIdList)) {
-                int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
-                String evaluateType = o.getEvaluateType();
                 System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
                 if (startId == 0 && "1".equals(evaluateType)) {
 
@@ -465,13 +465,17 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
                 } else if (startId == 0 && "3".equals(evaluateType)) {
                     //汇总审核结束 更新状态
                     outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
-                    //添加到月度排名表
-                    addMonthRank(o);
+//                    //添加到月度排名表
+//                    addMonthRank(o);
                 } else {
                     //过程中 暂不做处理
 
                 }
             }
+            if (startId == 0 && "3".equals(evaluateType)) {
+                //添加到月度排名表
+                addMonthRank(o);
+            }
             if ("1".equals(o.getType())) {
                 outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
             } else {

src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html

@@ -39,7 +39,7 @@
     let layer, laydate, table, form;
     let tableLoading;
     $(function () {
-        layui.use(['layer', 'laydate', 'table', 'form'], function () {
+        let use1 = layui.use(['layer', 'laydate', 'table', 'form'], function () {
             layer = layui.layer;
             laydate = layui.laydate;
             table = layui.table;
@@ -64,6 +64,16 @@
                 return false;
             });
         });
+        let use = use1;
+        // 获取当前页面类型
+
+        const typeValue = getUrlParam("type")
+        //  获取当前用户的组织机构id
+        const loginUser = localStorage.getItem('loginUser') ? JSON.parse(localStorage.getItem('loginUser')) : null;
+        if ((loginUser && loginUser.orgType == 1) || typeValue == 2) {
+            //   隐藏全部审核按钮
+            $('#allAudit').hide();
+        }
     });
 
     function initTable(deptId) {
@@ -401,4 +411,5 @@
         parent.search(1)
         parent.layer.close(index); // 再执行关闭
     }
+
 </script>