App任务管理page分页查询监理账号数据问题

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

@@ -1116,20 +1116,25 @@ public class TaskController extends BladeController {
                 }
             }
         } else if (contractInfo != null && (contractInfo.getContractType().equals(2) || contractInfo.getContractType().equals(3))) {
-            if (ObjectUtil.isNotEmpty(dto.getContractIdValue())) {
-                if (dto.getContractIdValue().equals(dto.getCurrentContractId())) {
-                    //如果下拉框合同段选择框合同段=当前用户登陆合同段，那么查询全部合同段的数据
-                    List<ContractRelationJlyz> contractRelationJLYZ = jdbcTemplate.query("select contract_id_sg from m_contract_relation_jlyz where contract_id_jlyz = " + dto.getCurrentContractId(), new BeanPropertyRowMapper<>(ContractRelationJlyz.class));
-                    Set<Long> ids = contractRelationJLYZ.stream().map(ContractRelationJlyz::getContractIdSg).collect(Collectors.toSet());
-                    ids.add(dto.getCurrentContractId()); //把监理本身也加入查询
-                    sqlString.append(" AND contract_id in(").append(StringUtils.join(ids, ",")).append(")");
+            if (ObjectUtil.isEmpty(dto.getOrdType())) { //Web端根据合同段查询
+                if (ObjectUtil.isNotEmpty(dto.getContractIdValue())) {
+                    if (dto.getContractIdValue().equals(dto.getCurrentContractId())) {
+                        //如果下拉框合同段选择框合同段=当前用户登陆合同段，那么查询全部合同段的数据
+                        List<ContractRelationJlyz> contractRelationJLYZ = jdbcTemplate.query("select contract_id_sg from m_contract_relation_jlyz where contract_id_jlyz = " + dto.getCurrentContractId(), new BeanPropertyRowMapper<>(ContractRelationJlyz.class));
+                        Set<Long> ids = contractRelationJLYZ.stream().map(ContractRelationJlyz::getContractIdSg).collect(Collectors.toSet());
+                        ids.add(dto.getCurrentContractId()); //把监理本身也加入查询
+                        sqlString.append(" AND contract_id in(").append(StringUtils.join(ids, ",")).append(")");
+                    } else {
+                        //如果下拉框合同段选择框合同段！=当前用户登陆合同段，那么查询下拉框合同段数据
+                        sqlString.append(" AND contract_id = ?");
+                        params.add(dto.getContractIdValue());
+                    }
                 } else {
-                    //如果下拉框合同段选择框合同段！=当前用户登陆合同段，那么查询下拉框合同段数据
-                    sqlString.append(" AND contract_id = ?");
-                    params.add(dto.getContractIdValue());
+                    //如果下拉框合同段id=null，那么查询当前整个项目的数据
+                    sqlString.append(" AND project_id = ?");
+                    params.add(dto.getProjectIdValue());
                 }
-            } else {
-                //如果下拉框合同段id=null，那么查询当前整个项目的数据
+            } else { //App直接查询全部合同段，整个项目
                 sqlString.append(" AND project_id = ?");
                 params.add(dto.getProjectIdValue());
             }