From b3a6181fd2e7d098e9ce227aa291c683217c5421 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 19 五月 2025 13:12:02 +0800 Subject: [PATCH] update --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 19 +++++++++++++++++++ springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java index 56e4035..1914b75 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java @@ -192,7 +192,7 @@ * @param simpleDateFormat * @return */ - List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(@Valid AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat); + List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat); /**+ @@ -201,7 +201,7 @@ * @param complaints * @return */ - List<AnalyticStatisticsThreeVo> analyticStatisticsThree(@Valid AnalyticStatisticsQuery query, List<Complaint> complaints); + List<AnalyticStatisticsThreeVo> analyticStatisticsThree(AnalyticStatisticsQuery query, List<Complaint> complaints); /** * 数据统计第四部分 diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java index 0caf05b..f41fb40 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java @@ -49,6 +49,7 @@ private final IComStreetService comStreetService; private final IComActService comActService; private final RedisUtils redisUtils; + private final ISystemUserLevelService systemUserLevelService; /** * 党员分页查询列表 * @@ -59,6 +60,24 @@ @Override public Page<PartyMember> pageList(PartyMemberQuery query, SystemUserVo loginUserInfo) { return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()),query,loginUserInfo); + // 判断当前登录用户是否有权限查看这个社区的党员 +// if(loginUserInfo.getAccountLevel()==1){ +// // 是市级权限 全查 +// return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()),query,loginUserInfo); +// } +// if(loginUserInfo.getAccountLevel()==2){ +// // 是区县权限 +// // 判断当前登录用户是否有权限查看这个社区的党员 +// LambdaQueryWrapper<PartyMember> queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(PartyMember::getDistrictsCode,loginUserInfo.getDistrictsCode()); +// if(StrUtil.isNotBlank(query.getName())){ +// queryWrapper.like(PartyMember::getName,query.getName()); +// } +// if(StrUtil.isNotBlank(query.getIdNumber())){} +// } +// return null; + + } /** * 添加党员 -- Gitblit v1.7.1