admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-17 16:39:47 +08:00
parent f2d1a4f564
commit 0fe701f57c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -154,6 +154,7 @@ public class SystemUserController {
@ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"), @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", 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") @PostMapping(value = "/getSystemUserBySnPage")
public Result<Page<SystemUser>> getSystemUserBySnPage(@RequestBody Map<String, Object> map) { public Result<Page<SystemUser>> getSystemUserBySnPage(@RequestBody Map<String, Object> map) {

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -729,7 +729,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
@Override @Override
public List<SystemUser> getSystemUsersBySn(Map<String, Object> map) { public List<SystemUser> getSystemUsersBySn(Map<String, Object> map) {
map.putIfAbsent("queryType", "default"); MapUtil.putIfNotBlank(map, "queryType", "default");
return systemUserMapper.getSystemUserBySn(map); return systemUserMapper.getSystemUserBySn(map);
} }
@ -1424,6 +1424,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
@Override @Override
public Page<SystemUser> getSystemUserBySnPage(Map<String, Object> map) { public Page<SystemUser> getSystemUserBySnPage(Map<String, Object> map) {
MapUtil.putIfNotBlank(map, "queryType", "default");
Page<SystemUser> page = PageUtil.getPage(map); Page<SystemUser> page = PageUtil.getPage(map);
return systemUserMapper.getSystemUserBySn(map, page); return systemUserMapper.getSystemUserBySn(map, page);
} }

5
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java
View File

@ -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.entity.vo.ProgressItemOverdueListVo;
import com.zhgd.xmgl.modules.project.mapper.ProgressTaskAlarmMapper; import com.zhgd.xmgl.modules.project.mapper.ProgressTaskAlarmMapper;
import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService; import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -36,8 +37,8 @@ public class ProgressTaskAlarmServiceImpl extends ServiceImpl<ProgressTaskAlarmM
@Override @Override
public List<ProgressItemOverdueListVo> selectProgressItemOverdueList(HashMap<String, Object> map) { public List<ProgressItemOverdueListVo> selectProgressItemOverdueList(HashMap<String, Object> map) {
//String projectSn, Integer pageNo, Integer pageSize //String projectSn, Integer pageNo, Integer pageSize
map.putIfAbsent("pageNo", 1); MapUtil.putIfNotBlank(map, "pageNo", 1);
map.putIfAbsent("pageSize", 20); MapUtil.putIfNotBlank(map, "pageSize", 20);
Integer pageNo = MapUtils.getInteger(map, "pageNo"); Integer pageNo = MapUtils.getInteger(map, "pageNo");
Integer pageSize = MapUtils.getInteger(map, "pageSize"); Integer pageSize = MapUtils.getInteger(map, "pageSize");
Page<ProgressItemOverdueListVo> page = new Page<>(pageNo, pageSize); Page<ProgressItemOverdueListVo> page = new Page<>(pageNo, pageSize);