|
@@ -184,7 +184,7 @@ public class WmTaskTypeController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/pages")
|
|
|
- public R getWmTaskTypePages(Page page, WmTaskType wmTaskType) {
|
|
|
+ public R getWmTaskTypePages(Page<WmTaskType> page, WmTaskType wmTaskType) {
|
|
|
|
|
|
List<WmTaskTypeEntRef> wmTaskTypeEntRefList = wmTaskTypeEntRefService.selectByAgentId(wmTaskType.getLevel1Id());
|
|
|
if (wmTaskTypeEntRefList.size() > 0) {
|
|
@@ -226,6 +226,7 @@ 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);
|
|
|
|