From d980d27cb99f2752f23ff4e525ea669cf445be88 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 16 Apr 2025 10:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=84=E4=BB=B7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/evaluate/dao/OutsourcerEvaluateDao.java  |  2 ++
 .../service/OutsourcerEvaluateServiceImpl.java        | 11 ++++++++---
 .../mappers/evaluate/OutsourcerEvaluateMapper.xml     |  8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java
index e300797..4f274b6 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java
@@ -151,4 +151,6 @@ public interface OutsourcerEvaluateDao {
     List<String> getPjEvaluateResultDeptId(EvaluateDataBean o);
 
     List<String> getPjTaskEvaluatedPostId(EvaluateDataBean o);
+
+    List<String> getOrgList();
 }
diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
index f945944..d193f8f 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
@@ -47,7 +47,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
     }
 
     @Override
-    public AjaxRes  getTableTitle(EvaluateSubBean o) {
+    public AjaxRes getTableTitle(EvaluateSubBean o) {
         AjaxRes ar = new AjaxRes();
         String deptId = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "0" : o.getDeptId();
         String deptName = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "项目部" : dao.getDeptNameById(deptId);
@@ -513,7 +513,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
                 }
             }
             outsourcerEvaluateDao.deleteEvaluateData(o);
-            outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId());
+            outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
             outsourcerEvaluateDao.saveEvaluateData(detailsList);
             o.setIsApprove("0");
             o.setEvaluateType("3");
@@ -1217,7 +1217,12 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
     @Override
     public List<OutSourceBean> getTeamEvaluateList(OutSourceBean o) {
         o.setUserId(UserUtil.getLoginUser().getId().toString());
-        o.setDeptId(UserUtil.getLoginUser().getDeptId());
+        List<String> orgList = dao.getOrgList();
+        if (orgList.size() > 0 && orgList.contains(UserUtil.getLoginUser().getDeptId())) {
+            o.setDeptId("-1");
+        } else {
+            o.setDeptId(UserUtil.getLoginUser().getDeptId());
+        }
         return dao.getTeamEvaluateList(o);
     }
 
diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml
index 0c08289..9a02cb1 100644
--- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml
+++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml
@@ -802,6 +802,14 @@
     <select id="getPjTaskEvaluatedPostId" resultType="java.lang.String">
         select post_id from pj_task_evaluated where evaluate_id =#{evaluateId}
     </select>
+    <select id="getOrgList" resultType="java.lang.String">
+        select
+            id
+          from
+              pm_org_info
+         where
+             org_type = '1'
+    </select>
 
     <update id="updateEvaluateRecordByEvaluateId">
         update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}