fix: 不显示已标记del的任务类型

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptTaskTypeConfigServiceImpl.java

@@ -268,7 +268,8 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 		List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
 				.eq(WmTaskType::getDeptId, deptId)
 				.eq(WmTaskType::getRuleId, durgentId)
-				.eq(WmTaskType::getTaskEntId, durgentId));
+				.eq(WmTaskType::getTaskEntId, durgentId)
+				.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val()));
 
 		WmDeptTaskTypeConfig deptTaskTypeConfig = this.getOne(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery()
 				.eq(WmDeptTaskTypeConfig::getDeptId, deptId));
@@ -388,6 +389,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 		taskTypeWrapper.eq(WmTaskType::getDeptId, deptId);
 		taskTypeWrapper.eq(WmTaskType::getRuleId, durgentId);
 		taskTypeWrapper.eq(WmTaskType::getTaskEntId, durgentId);
+		taskTypeWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
 		if (org.apache.commons.lang.StringUtils.isNotBlank(taskTypeName)) {
 			taskTypeWrapper.like(WmTaskType::getTaskTypeName, taskTypeName);
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -1108,7 +1108,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
 		LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
 				.eq(WmTaskType::getTaskTypeLevel, "1")
-				.eq(WmTaskType::getEnableFlag, EnableEnum.ENABLE.val());
+				.eq(WmTaskType::getEnableFlag, EnableEnum.ENABLE.val())
+				.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
 		if (StrUtil.isNotBlank(taskTypeName)) {
 			queryWrapper.eq(WmTaskType::getTaskTypeName, taskTypeName);
 		} else {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskTypeSubCate2ServiceImpl.java

@@ -60,10 +60,10 @@ public class WmTaskTypeSubCate2ServiceImpl extends ServiceImpl<WmTaskTypeSubCate
 
 		// 查询企业对应的任务类型
 		LambdaQueryWrapper<WmTaskType> taskTypeWrapper = Wrappers.lambdaQuery();
+		taskTypeWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
 		// 根据企业类型拼接查询条件
 		if (DeptLevelEnum.ADMIN.getVal().equals(dept.getLevel())) {
 			taskTypeWrapper.eq(WmTaskType::getTaskTypeLevel, "1");
-			taskTypeWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
 		} else if (DeptLevelEnum.ENT.getVal().equals(dept.getLevel())) {
 			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntMapper.selectOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
 					.eq(WmDaDrugEnt::getDeptId, deptId)