fix: 积分规则查询条件问题

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

@@ -21,6 +21,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
@@ -126,19 +127,24 @@ public class WmTaskTypeController {
 	 *
 	 * @param page       分页对象
 	 * @param wmTaskType 任务类型打分表
-	 * @return
+	 * @return 分页数据
 	 */
 	@GetMapping("/page")
-	public R getWmTaskTypePage(Page page, WmTaskType wmTaskType) {
-		LambdaQueryWrapper<WmTaskType> queryWrapper ;
+	public R<IPage<WmTaskTypeVO>> getWmTaskTypePage(Page<WmTaskType> page, WmTaskType wmTaskType) {
+		List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
+				"统计分析", "临床监察", "通用", "患者教育");
+		LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
+				.eq(WmTaskType::getRuleId, wmTaskType.getRuleId())
+				.notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);
+
 		if (wmTaskType.getRuleId() != null){
-			List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
-					"统计分析", "临床监察", "通用", "患者教育");
-			queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
-					.eq(WmTaskType::getRuleId, wmTaskType.getRuleId())
-					.notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);
-		} else {
-			queryWrapper = Wrappers.lambdaQuery(wmTaskType);
+			queryWrapper.eq(WmTaskType::getRuleId, wmTaskType.getRuleId());
+		}
+		if (StrUtil.isNotBlank(wmTaskType.getTaskTypeName())) {
+			queryWrapper.eq(WmTaskType::getTaskTypeName, wmTaskType.getTaskTypeName());
+		}
+		if (StrUtil.isNotBlank(wmTaskType.getEnableFlag())) {
+			queryWrapper.eq(WmTaskType::getEnableFlag, wmTaskType.getEnableFlag());
 		}
 
 		Page<WmTaskType> pageResult = wmTaskTypeService.page(page, queryWrapper);