Revert "fix: 积分规则列表页不显示标记del的数据2"

This reverts commit 470a05675da540df6135c8ef2ce7468efe0dcfa9.

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -184,41 +184,39 @@ public class WmTaskTypeController {
 	 * @return
 	 */
 	@GetMapping("/pages")
-	public R getWmTaskTypePages(Page<WmTaskType> page, WmTaskType wmTaskType) {
+	public R getWmTaskTypePages(Page page, WmTaskType wmTaskType) {
 
 		List<WmTaskTypeEntRef> wmTaskTypeEntRefList = wmTaskTypeEntRefService.selectByAgentId(wmTaskType.getLevel1Id());
 		if (wmTaskTypeEntRefList.size() > 0) {
-			return R.ok(page);
-		}
-
-		for (WmTaskTypeEntRef wmTaskTypeEntRef1 : wmTaskTypeEntRefList) {
-			//cso新增   药企id空   AgentId 有
-			if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId() && !"".equals(wmTaskTypeEntRef1.getAgentId())
-					&& !"".equals(wmTaskTypeEntRef1.getDrugentId())
-			) {
-				wmTaskType.setLevel1Id(wmTaskTypeEntRef1.getAgentId());
-				List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
-				for (WmTaskType wmTaskType1 : wmTaskTypeList) {
-
-					if (wmTaskType1.getDurgentId() == null && "".equals(wmTaskType1.getDurgentId()) &&
-							null != wmTaskType1.getLevel1Id() && "".equals(wmTaskType1.getLevel1Id())) {
-						wmTaskType.setRuleId(wmTaskType1.getRuleId());
+			for (WmTaskTypeEntRef wmTaskTypeEntRef1 : wmTaskTypeEntRefList) {
+				//cso新增   药企id空   AgentId 有
+					if (null!=wmTaskTypeEntRef1.getAgentId()&&null!=wmTaskTypeEntRef1.getDrugentId()&&!"".equals(wmTaskTypeEntRef1.getAgentId())
+							&& !"".equals(wmTaskTypeEntRef1.getDrugentId())
+					) {
+					wmTaskType.setLevel1Id(wmTaskTypeEntRef1.getAgentId());
+					List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
+					for (WmTaskType wmTaskType1 : wmTaskTypeList) {
+
+						if (wmTaskType1.getDurgentId()==null && "".equals(wmTaskType1.getDurgentId()) &&
+								null!=wmTaskType1.getLevel1Id() && "".equals(wmTaskType1.getLevel1Id())) {
+							wmTaskType.setRuleId(wmTaskType1.getRuleId());
+						}
 					}
-				}
-				//药企新增  两个都是药企id
-			} else if (wmTaskTypeEntRef1.getAgentId().equals(wmTaskTypeEntRef1.getDrugentId())) {
-				wmTaskType.setRuleId(wmTaskTypeEntRef1.getAgentId());
-				//药企给cso新增   两个都有值  药企和cso
-			} else if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId()
-					&& !"".equals(wmTaskTypeEntRef1.getAgentId()) && !"".equals(wmTaskTypeEntRef1.getDrugentId())
-			) {
-				wmTaskType.setRuleId(wmTaskTypeEntRef1.getDrugentId() + wmTaskTypeEntRef1.getAgentId());
-				List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
-				for (WmTaskType wmTaskType1 : wmTaskTypeList) {
-					if (null != wmTaskType1.getDurgentId() && null != wmTaskType1.getLevel1Id()
-							&& !"".equals(wmTaskType1.getDurgentId()) && !"".equals(wmTaskType1.getLevel1Id())) {
-						wmTaskType.setRuleId(wmTaskType1.getRuleId());
-
+					//药企新增  两个都是药企id
+				} else if (wmTaskTypeEntRef1.getAgentId().equals(wmTaskTypeEntRef1.getDrugentId())) {
+					wmTaskType.setRuleId(wmTaskTypeEntRef1.getAgentId());
+					//药企给cso新增   两个都有值  药企和cso
+					} else if (null!=wmTaskTypeEntRef1.getAgentId()&&null!=wmTaskTypeEntRef1.getDrugentId()
+							&&!"".equals(wmTaskTypeEntRef1.getAgentId())&&!"".equals(wmTaskTypeEntRef1.getDrugentId())
+					) {
+					wmTaskType.setRuleId(wmTaskTypeEntRef1.getDrugentId() + wmTaskTypeEntRef1.getAgentId());
+					List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
+					for (WmTaskType wmTaskType1 : wmTaskTypeList) {
+						if (null!=wmTaskType1.getDurgentId()&&null!=wmTaskType1.getLevel1Id()
+								&&!"".equals(wmTaskType1.getDurgentId())&&!"".equals(wmTaskType1.getLevel1Id())) {
+							wmTaskType.setRuleId(wmTaskType1.getRuleId());
+
+						}
 					}
 				}
 			}
@@ -228,7 +226,6 @@ public class WmTaskTypeController {
 		List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
 				"统计分析", "临床监察", "通用", "患者教育");
 		queryWrapper.notIn(WmTaskType::getTaskTypeName,noDisplayTaskTypeNameList);
-		queryWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
 
 		Page<WmTaskType> pageResult = wmTaskTypeService.page(page, queryWrapper);