From ba41b9351647a36bad13c0ab03d3fb602f5f4b27 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 23 六月 2025 17:47:04 +0800 Subject: [PATCH] 2.0后台模块 --- springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintRejectServiceImpl.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintRejectServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintRejectServiceImpl.java index 3df28b3..9f2e233 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintRejectServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintRejectServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.panzhihua.common.model.vos.west.SystemUserVo; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.westcommittee.dao.ComplaintRejectMapper; import com.panzhihua.westcommittee.model.entity.ComplaintReject; @@ -25,7 +26,7 @@ public class ComplaintRejectServiceImpl extends ServiceImpl<ComplaintRejectMapper, ComplaintReject> implements IComplaintRejectService { @Override - public IPage<ComplaintRejectVo> getComplaintRejectList(ComplaintRejectQuery query) { + public IPage<ComplaintRejectVo> getComplaintRejectList(ComplaintRejectQuery query, SystemUserVo systemUserVo) { Page<ComplaintRejectVo> page = new Page<>(query.getPageNum(), query.getPageSize()); String applyStartTime=null; String applyEndTime=null; @@ -41,11 +42,15 @@ examineStartTime=split[0]+" 00:00:00"; examineEndTime=split[1]+" 23:59:59"; } - return this.baseMapper.getComplaintRejectList(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query); + if(systemUserVo.getSystemRoleId()<2){ + return this.baseMapper.getComplaintRejectList(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query,systemUserVo.getSystemRoleId()); + }else { + return this.baseMapper.getComplaintRejectList1(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query,systemUserVo.getOneDepartmentId()); + } } @Override - public IPage<ComplaintRejectVo> getComplaintRejectListOther(ComplaintRejectQuery query, List<String> finalDistrictsCodes, List<String> finalStreetIds, List<Long> finalCommunityIds) { + public IPage<ComplaintRejectVo> getComplaintRejectListOther(ComplaintRejectQuery query, List<String> finalDistrictsCodes, List<String> finalStreetIds, List<Long> finalCommunityIds, SystemUserVo loginUserInfo) { Page<ComplaintRejectVo> page = new Page<>(query.getPageNum(), query.getPageSize()); String applyStartTime=null; String applyEndTime=null; @@ -61,6 +66,6 @@ examineStartTime=split[0]+" 00:00:00"; examineEndTime=split[1]+" 23:59:59"; } - return this.baseMapper.getComplaintRejectListOther(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query,finalDistrictsCodes,finalStreetIds,finalCommunityIds); + return this.baseMapper.getComplaintRejectListOther(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query,finalDistrictsCodes,finalStreetIds,finalCommunityIds,loginUserInfo.getSystemRoleId()); } } -- Gitblit v1.7.1