From 150bacb29c8ce6663e189e254b4e48f6984b4d0e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 27 十月 2022 11:30:57 +0800
Subject: [PATCH] 修改导办人员登录系统导办列表数据不对  bug

---
 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index 084437d..8ae554b 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -82,6 +82,15 @@
     <select id="selectConfigList"  resultMap="GuideRepairOrderResult">
         <include refid="selectGuideRepairOrderVo"/>
         <where>
+            <if test="ids != null">
+                and department_id IN
+                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
+                    #{param}
+                </foreach>
+            </if>
+            <if test="guideUserId != null and guideUserId != ''">
+                AND a.guide_user_id=#{guideUserId}
+            </if>
             <if test="matterName != null and matterName != ''">
                 AND (matter_name like concat('%', #{matterName}, '%')) or
                 ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
@@ -96,15 +105,6 @@
             <if test="status != null and status != ''">
                 AND a.state=#{status}
             </if>
-            <if test="ids != null">
-                and department_id IN
-                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
-                    #{param}
-                </foreach>
-            </if>
-            <if test="guideUserId != null and guideUserId != ''">
-                AND a.guide_user_id=#{guideUserId}
-            </if>
         </where>
         order by  update_time desc ,  create_time desc
     </select>
@@ -112,6 +112,15 @@
     <select id="countConfigList"  resultType="integer">
         select count(id) from automessage_guide_repair_order
         <where>
+            <if test="ids != null">
+                and department_id IN
+                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
+                    #{param}
+                </foreach>
+            </if>
+            <if test="guideUserId != null and guideUserId != ''">
+                AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
+            </if>
             <if test="matterName != null and matterName != ''">
                 AND (matter_name like concat('%', #{matterName}, '%')) or
                 ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
@@ -126,15 +135,7 @@
             <if test="status != null and status != ''">
                 AND automessage_guide_repair_order.state=#{status}
             </if>
-            <if test="ids != null">
-                and department_id IN
-                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
-                    #{param}
-                </foreach>
-            </if>
-            <if test="guideUserId != null and guideUserId != ''">
-                AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
-            </if>
+
         </where>
     </select>
 

--
Gitblit v1.7.1