9/11 youhua1.0

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

@@ -43,7 +43,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY sw.workplaceId
+        ORDER BY  sw.deptCode, sw.chargeUser ,sw.workplaceId
     </select>
 
 

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -615,7 +615,13 @@
                 AND (
                 nameCode LIKE concat('%', #{nameCode}, '%')
                 or ybbm LIKE concat('%', #{nameCode}, '%')
-                or sptm LIKE concat('%', #{nameCode}, '%'))
+                or sptm LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.mainId LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.thirdId LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.thirdId1 LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.thirdId2 LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.thirdId3 LIKE concat('%', #{nameCode}, '%')
+                or basic_udirel.thirdId4 LIKE concat('%', #{nameCode}, '%'))
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')