增加本机构数据权限的逻辑

src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -55,9 +55,6 @@
         <if test="subType != null">
             and dh.sub_type='${subType}'
         </if>
-        <if test="handsPersonId != null">
-            and dh.hands_person_id='${handsPersonId}'
-        </if>
         <if test="number != null">
             and dh.number like '%${number}%'
         </if>
@@ -73,6 +70,13 @@
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
         </if>
+        <if test="handsPersonIds != null">
+            and dh.hands_person_id in (
+            <foreach collection="handsPersonIds" item="handsPersonId" separator=",">
+                #{handsPersonId}
+            </foreach>
+            )
+        </if>
         and ifnull(dh.delete_flag,'0') !='1'
         order by dh.id desc
         <if test="offset != null and rows != null">
@@ -92,9 +96,6 @@
         <if test="subType != null">
             and sub_type='${subType}'
         </if>
-        <if test="handsPersonId != null">
-            and hands_person_id='${handsPersonId}'
-        </if>
         <if test="number != null">
             and number like '%${number}%'
         </if>
@@ -110,6 +111,13 @@
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
         </if>
+        <if test="handsPersonIds != null">
+            and hands_person_id in (
+            <foreach collection="handsPersonIds" item="handsPersonId" separator=",">
+                #{handsPersonId}
+            </foreach>
+            )
+        </if>
         and ifnull(jsh_depot_head.delete_Flag,'0') !='1') tb
     </select>
 

src/main/resources/mapper_xml/UserMapperEx.xml

@@ -29,7 +29,7 @@
         <if test="loginName != null">
             and user.login_name like '%${loginName}%'
         </if>
-        order by user.id desc
+        order by rel.user_blng_orga_dspl_seq,user.id desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>