Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master

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

@@ -100,8 +100,8 @@ public class TaskServiceImpl implements TaskService {
 
         int aprType=0;
         if (StrUtil.isNotBlank(realName)||StrUtil.isNotBlank(certiCode)) {
-            int count = taskMapper.queryApplyCount(realName,certiCode,2,1);
-            aprType=count>0?1:0;//count>0 初评已过，查询复评数据。
+            int count = taskMapper.queryApplyCount(realName,certiCode,2,2);
+            aprType=count>0?1:0;//count>0 复评已过，查询复评数据，反之查询初评数据。
         }
         return taskMapper.taskDistributionList(page, organIds, provincial, city,
                 street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area,type,aprType);