From 7e0dd461d47a101ad529e1d6675957bf974024f8 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: Wed, 27 Aug 2025 15:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamagnetic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 183fb1e6..9c7fc37e 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -70,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--监理单位/总包公司/分包单位-->
         <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         <where>
-            and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
             <if test="infoType != null "> and ssp.infoType = #{infoType}</if>
             <if test="roleType != null and roleType >0 "> and ssp.roleType = #{roleType}</if>
@@ -117,16 +116,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and roleType in
                 <foreach collection="roleTypes" item="item" index="index" open="(" close=")" separator=",">${item}</foreach>
             </if>
+            and ssp.isDel=0
         </where>
-        order by createTime desc
+        order by ssp.id desc
     </select>
 
     <select id="selectWechatSmzSspProblemmodifyList" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
         select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.problemType, su.nick_name as createBy,
         case when ud.type_flag in (1,11) then sd.dept_name else ud.dept_name end as deptName,
         sdd.dict_label as danger_type_name,
-        case when ssp.recheckSendUser = #{nowUser} and ssp.checkState=1 then 0
-             when ssp.lordSentUser = #{nowUser} then 1
+        case when ssp.lordSentUser = #{nowUser} and ssp.checkState=0 then
+             when ssp.recheckSendUser = #{nowUser} and ssp.checkState=1 then 1
         else 2 end sort,
         zgd.type_flag as zgDeptType,
         fjd.type_flag as fjDeptType
@@ -144,7 +144,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--监理单位/总包公司/分包单位-->
         <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
         <where>
-            and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
             <if test="infoType != null "> and ssp.infoType = #{infoType}</if>
             <if test="problemType != null "> and ssp.problemType = #{problemType}</if>
@@ -186,8 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeName == "fj"'> and ssp.checkState = 1 </if>
             <if test='activeName == "ycl"'> and ssp.checkState = 4 </if>
             <if test='activeName == "zgcs"'> and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime))) </if>
+            and ssp.isDel=0
         </where>
-        order by sort,ssp.createTime desc
+        order by sort,ssp.id desc
     </select>
 
     <select id="findGroupCountByProjectId" parameterType="SmzSspProblemmodify" resultType="map">