From 35234fb9cc6ea3e7815bb1649bd25beae82c7149 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Thu, 10 Jul 2025 16:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/supplier/common/SecurityConfig.java  | 18 -------
 .../mapper/CoscoEvaluateTaskMapper.xml        | 52 +++++++++++--------
 2 files changed, 29 insertions(+), 41 deletions(-)
 delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/SecurityConfig.java

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/SecurityConfig.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/SecurityConfig.java
deleted file mode 100644
index 5e6826a..0000000
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/SecurityConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.chinaunicom.zyhy.ebtp.supplier.common;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .authorizeRequests()
-                .anyRequest().permitAll()
-                .and()
-                .csrf().disable();
-    }
-}
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
index 0160183..c6adc2e 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
@@ -342,33 +342,39 @@
         </foreach>
     </select>
 
+    <sql id="taskPageSql">
+        select cet.id,
+               cet.evaluate_theme as evaluateTheme,
+               '单位' as tenantName,
+               cec.category_name as categoryName,
+               cet.start_time as startTime,
+               cet.end_time as endTime,
+               cet.status,
+               cet.dept_id as deptId,
+               cet.approve_status as approveStatus,
+               case
+                   when cet.approve_status = 0 then '审批中'
+                   when cet.approve_status = 1 then '通过'
+                   when cet.approve_status = 2 then '驳回'
+                   else '未审批' end as approveName,
+               case
+                   when cet.status = 0 then '待评价'
+                   when cet.status = 1 then '评价中'
+                   when cet.status = 2 then '已结束' end as statusName
+        from cosco_evaluate_task cet
+
+                 left join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
+                 left join cosco_category cec on cet.category_id=cec.id
+    </sql>
 
     <select id="selectTaskPage" parameterType="map"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo">
-        select cet.id,
-        cet.evaluate_theme as evaluateTheme,
-        '单位' as tenantName,
-        cec.category_name as categoryName,
-        cet.start_time as startTime,
-        cet.end_time as endTime,
-        cet.status,
-        cet.dept_id as deptId,
-        cet.approve_status as approveStatus,
-        case
-        when cet.approve_status = 0 then '审批中'
-        when cet.approve_status = 1 then '通过'
-        when cet.approve_status = 2 then '驳回'
-        else '未审批' end as approveName,
-        case
-        when cet.status = 0 then '待评价'
-        when cet.status = 1 then '评价中'
-        when cet.status = 2 then '已结束' end as statusName
-        from cosco_evaluate_task cet
-
-        left join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
-        left join cosco_category cec on cet.category_id=cec.id
+        <include refid="taskPageSql"></include>
         <where>
             and cet.del_flag='normal'
+            <if test="vo.deptId!=null and vo.deptId!=null">
+                and cet.dept_id =#{vo.deptId}
+            </if>
             <if test="vo.userId!=null">
                 and cetsu.user_id=#{vo.userId}
             </if>
@@ -381,8 +387,8 @@
             <if test="vo.startTime!=null and vo.endTime!=null">
                 and cet.start_time between #{vo.startTime} and #{vo.endTime}
             </if>
+
         </where>
-        group by id
         order by cet.create_time desc
     </select>
     <select id="selectMyPage"