feat:权限

src/main/java/com/winhc/repal/service/impl/RepalRemindHistoryServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -250,6 +251,8 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
         if(ObjectUtil.isNull(dto.getQueryType())){
             throw new CommonException(CodeMsg.VALIDATE_PARAMETER);
         }
+        //权限
+        boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),PermissionEnum.QUERY_ALL_URGE.getCode());
         LocalDateTime localDateTime = LocalDateTime.now().withYear(2019);
         //添加查询时间的条件
         if (StrUtil.isBlank(dto.getTimeSlot()) || Dict.TIME_SLOT_ENUM.本月.getCode().equals(dto.getTimeSlot())) {
@@ -293,7 +296,9 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                     .eq(RepalGroupMember::getDeleted,Dict.DeletedStatusEnunm.否.getCode()),false);
             if(repalGroupMember!=null){
                 List<RepalCustomer> repalCustomers = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).eq(RepalCustomer::getRepalGroupId,repalGroupMember.getRepalGroupId()).eq(RepalCustomer::getDeleted,Dict.DeletedStatusEnunm.否.getCode()));
-                List<RepalBill> repalBills = repalBillService.list(Wrappers.lambdaQuery(RepalBill.class).in(RepalBill::getCustomerId,repalCustomers.stream().map(RepalCustomer::getCustId).collect(Collectors.toList())).eq(RepalBill::getDeleted, Dict.DeletedStatusEnunm.否.getCode()));
+                LambdaQueryWrapper<RepalBill> qw = Wrappers.lambdaQuery(RepalBill.class).in(RepalBill::getCustomerId,repalCustomers.stream().map(RepalCustomer::getCustId).collect(Collectors.toList())).eq(RepalBill::getDeleted, Dict.DeletedStatusEnunm.否.getCode());
+                qw.exists(!allFlag,"select 1 from REPAL_RESPONSIBLE_PERSON C WHERE C.DELETED = 0 AND C.REPAL_BILL_ID = REPAL_BILL.ID AND C.USER_ID = "+userBean.getUserId());
+                List<RepalBill> repalBills = repalBillService.list(qw);
                 for(RepalBill repalBill:repalBills){
                     RepalRemindReadInfo repalRemindReadInfo = repalRemindReadInfoService.getReadInfoByUserId(userBean.getUserId(), repalBill.getId(), repalBill.getRepalBookId());
                     RepalRemindCountVO tmp = repalRemindHistoryMapper.remindCount(repalBill.getId(),localDateTime,repalRemindReadInfo.getRiskRemindId(),repalRemindReadInfo.getRankRemindId(),repalRemindReadInfo.getOverdueRemindId(),repalRemindReadInfo.getFinanceRemindId());
@@ -451,7 +456,7 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                 }
                 Map<String,RepalCustomer> repalCustomerMap = repalCustomers.stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity(),(a,b)->a));
                 qw.in(RepalRemindHistory::getRepalBillId,repalBills.stream().map(RepalBill::getId).collect(Collectors.toList()));
-                qw.exists(!allFlag,"select 1 from REPAL_CUST_CHARGE_REL C WHERE C.CUST_ID = REPAL_REMIND_HISTORY.CUST_ID AND C.MEMBER_USER_ID = "+userBean.getUserId());
+                qw.exists(!allFlag,"select 1 from REPAL_RESPONSIBLE_PERSON C WHERE C.DELETED = 0 AND C.REPAL_BILL_ID = REPAL_REMIND_HISTORY.REPAL_BILL_ID AND C.USER_ID = "+userBean.getUserId());
                 IPage<RepalRemindHistory> pageAccountRemindHistory = page(new Page<>(pageNum, pageSize), qw);
                 if(CollUtil.isNotEmpty(pageAccountRemindHistory.getRecords())){
                     result = new VOPage<>(pageNum, pageSize, pageAccountRemindHistory.getTotal(), pageAccountRemindHistory.getRecords().stream()