|
@@ -221,22 +221,39 @@ public class CheckRecordService extends BasicService {
|
|
|
return ExecutedResult.success(result);
|
|
|
}
|
|
|
|
|
|
- public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search, boolean isGridAdmin) {
|
|
|
+ public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search, Boolean isGridAdmin) {
|
|
|
List<CheckRecordVO> listVo = new ArrayList<>();
|
|
|
|
|
|
- if (isGridAdmin) {
|
|
|
- LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
- if (Objects.isNull(loginUser)) {
|
|
|
- throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
|
|
|
- }
|
|
|
- // 获取用户
|
|
|
- SysUser user = userMapper.selectUserById(Long.parseLong(loginUser.getLoginId()));
|
|
|
- // 获取当前登录用户是网格管理员的网格id
|
|
|
- List<Long> listGrid = gridPersonMapper.listGrid4AdminUser(user.getUserGuid());
|
|
|
- if (ListUtil.isNullOrEmpty(listGrid)) {
|
|
|
- return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
|
|
|
+ if (Objects.nonNull(isGridAdmin)) {
|
|
|
+ if (isGridAdmin) {
|
|
|
+ LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
+ if (Objects.isNull(loginUser)) {
|
|
|
+ throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
|
|
|
+ }
|
|
|
+ // 获取用户
|
|
|
+ SysUser user = userMapper.selectById(loginUser.getUserId());
|
|
|
+ // 获取当前登录用户是网格管理员的网格列表
|
|
|
+ List<Long> listGrid = gridPersonMapper.listGrid4AdminUser(user.getUserGuid());
|
|
|
+ if (ListUtil.isNullOrEmpty(listGrid)) {
|
|
|
+ return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
|
|
|
+ }
|
|
|
+ // 设置查询的网格范围
|
|
|
+ search.setListGridId(listGrid);
|
|
|
+ } else {
|
|
|
+ LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
+ if (Objects.isNull(loginUser)) {
|
|
|
+ throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
|
|
|
+ }
|
|
|
+ // 获取用户
|
|
|
+ SysUser user = userMapper.selectById(loginUser.getUserId());
|
|
|
+ // 获取当前登录用户所属网格列表
|
|
|
+ List<Long> listGrid = gridPersonMapper.listGrid4User(user.getUserGuid());
|
|
|
+ if (ListUtil.isNullOrEmpty(listGrid)) {
|
|
|
+ return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
|
|
|
+ }
|
|
|
+ // 设置查询的网格范围
|
|
|
+ search.setListGridId(listGrid);
|
|
|
}
|
|
|
- search.setListGridId(listGrid);
|
|
|
}
|
|
|
// 处理创建时间范围-查询参数
|
|
|
Tuple<String, String> createTimeRange = ParameterUtil.getTimeRange(search.getCreateTimeRange());
|