Merge remote-tracking branch 'origin/master' into dev-20230213BugFix-zwl

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -124,12 +124,13 @@ public class TaskServiceImpl implements TaskService {
         如果省市区下没有对应的组长,就查询省市下的对应组长,如果省市下也没有就查询省下的组长
          */
         if (aprEmpVOS == null || aprEmpVOS.size() <= 0) {
-            if (StringUtils.isNotBlank(provincial) || StringUtils.isNotBlank(city) || StringUtils.isNotBlank(area)) {
+            /*if (StringUtils.isNotBlank(provincial) || StringUtils.isNotBlank(city) || StringUtils.isNotBlank(area)) {
                 aprEmpVOS = taskMapper.aprEmpList(provincial, city, null, organName, name, tel, groupLeader);
                 if (aprEmpVOS == null || aprEmpVOS.size() <= 0) {
                     aprEmpVOS = taskMapper.aprEmpList(provincial, null, null, organName, name, tel, groupLeader);
                 }
-            }
+            }*/
+            aprEmpVOS = taskMapper.aprEmpList(null, null, null, organName, name, tel, groupLeader);
         }
         return aprEmpVOS;
     }

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -239,7 +239,7 @@
         LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
         <where>
             and organ.STATUS = 0
-            <if test="provincial != null and provincial != ''">
+            <!--<if test="provincial != null and provincial != ''">
                 and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
             </if>
             <if test="city != null and city != ''">
@@ -247,7 +247,7 @@
             </if>
             <if test="area != null and area != ''">
                 and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
-            </if>
+            </if>-->
             <if test="organName != null and organName != ''">
                 and organ.organ_name like CONCAT(CONCAT('%',#{organName}) ,'%')
             </if>