From f598a52789390251b0bc3cba574a6a904b526520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 8 Mar 2025 16:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/flowable/FlowBusinessKeyMapper.xml   | 8 ++++----
 .../manage/controller/SmzSspProblemmodifyController.java  | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index 977b220d..c11cfa0b 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -157,27 +157,27 @@
     </select>
 
     <select id="selectMyAwaitSspTask" resultType="Map">
-        select '106' as category, count(1) as total from smz_ssp_problemmodify
+        select '106' as category, id from smz_ssp_problemmodify
         <where>
             infoType=0
             <if test="proId != null"> and projectId=#{proId}</if>
             <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
         </where>
         union all
-        select '107' as category, count(1) as total from smz_ssp_problemmodify
+        select '107' as category, id from smz_ssp_problemmodify
         <where>
             infoType=0
             <if test="proId != null"> and projectId=#{proId}</if>
             <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
         </where>
-        select '108' as category, count(1) as total from smz_ssp_problemmodify
+        select '108' as category, id from smz_ssp_problemmodify
         <where>
             infoType=1
             <if test="proId != null"> and projectId=#{proId}</if>
             <if test="userId != null"> and lordSent=#{userId} and checkState in (0,3)</if>
         </where>
         union all
-        select '109' as category, count(1) as total from smz_ssp_problemmodify
+        select '109' as category, id from smz_ssp_problemmodify
         <where>
             infoType=1
             <if test="proId != null"> and projectId=#{proId}</if>
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java
index e8080a00..2c1488c9 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java
@@ -229,7 +229,6 @@ public class SmzSspProblemmodifyController extends BaseController
     }
 
     /**
-<<<<<<< HEAD
      * 查询问题整改详情
      * @param id
      * @return