Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into lihb

blade-service/blade-business/src/main/java/org/springblade/business/controller/FixedFlowController.java

@@ -78,7 +78,7 @@ public class FixedFlowController extends BladeController {
         //获取当前系统配置的角色划分
         List<RoleVO> roleVOS = this.sysClient.search().getData();
         //获取项目人员
-        List<SaveUserInfoByProjectDTO> contractUserList = this.projectAssignmentUserClient.queryContractDownAllUser(contractId, 2);
+        List<SaveUserInfoByProjectDTO> contractUserList = this.projectAssignmentUserClient.queryContractDownAllUser(contractId, 1);
 
         //先处理管理员
         for (RoleVO vos : roleVOS) {

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1381,7 +1381,7 @@ public class TaskController extends BladeController {
             sqlString.append(")");
         }
         //是否填报过
-        sqlString.append(" AND (SELECT COUNT(1)  FROM u_information_query WHERE u_task.form_data_id = id and is_deleted=0) > 0");
+//        sqlString.append(" AND (SELECT COUNT(1)  FROM u_information_query WHERE u_task.form_data_id = id and is_deleted=0) > 0");
 
         //总数量
         String sqlCount = sqlString.toString().replace("*", "count(1)");