diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 6e60ee247..6139dd343 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -154,6 +154,7 @@ public class SystemUserController { @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "queryType", required = true, value = "default:默认企业或项目SN查找账号列表,projectLevel:查询项目级别账号,projectLevelAndChildren:查询项目级别和项目子账号", paramType = "body"), }) @PostMapping(value = "/getSystemUserBySnPage") public Result> getSystemUserBySnPage(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index ffac3096a..5d106398c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -729,7 +729,7 @@ public class SystemUserServiceImpl extends ServiceImpl getSystemUsersBySn(Map map) { - map.putIfAbsent("queryType", "default"); + MapUtil.putIfNotBlank(map, "queryType", "default"); return systemUserMapper.getSystemUserBySn(map); } @@ -1424,6 +1424,7 @@ public class SystemUserServiceImpl extends ServiceImpl getSystemUserBySnPage(Map map) { + MapUtil.putIfNotBlank(map, "queryType", "default"); Page page = PageUtil.getPage(map); return systemUserMapper.getSystemUserBySn(map, page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java index c5e9bf119..518a7b4dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java @@ -8,6 +8,7 @@ import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO; import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo; import com.zhgd.xmgl.modules.project.mapper.ProgressTaskAlarmMapper; import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService; +import com.zhgd.xmgl.util.MapUtil; import com.zhgd.xmgl.util.PageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +37,8 @@ public class ProgressTaskAlarmServiceImpl extends ServiceImpl selectProgressItemOverdueList(HashMap map) { //String projectSn, Integer pageNo, Integer pageSize - map.putIfAbsent("pageNo", 1); - map.putIfAbsent("pageSize", 20); + MapUtil.putIfNotBlank(map, "pageNo", 1); + MapUtil.putIfNotBlank(map, "pageSize", 20); Integer pageNo = MapUtils.getInteger(map, "pageNo"); Integer pageSize = MapUtils.getInteger(map, "pageSize"); Page page = new Page<>(pageNo, pageSize);