feat：groupId long->string

src/main/java/com/winhc/repal/entity/RepalCustomer.java

@@ -35,7 +35,7 @@ public class RepalCustomer implements Serializable {
 
     @ApiModelProperty(value = "所属组织id")
     @TableField("REPAL_GROUP_ID")
-    private Long repalGroupId;
+    private String repalGroupId;
 
     @ApiModelProperty(value = "客户名称")
     @TableField("CUST_NAME")

src/main/java/com/winhc/repal/entity/RepalGroupMember.java

@@ -35,7 +35,7 @@ public class RepalGroupMember implements Serializable {
 
     @ApiModelProperty(value = "组织id")
     @TableField("REPAL_GROUP_ID")
-    private Long repalGroupId;
+    private String repalGroupId;
 
     @ApiModelProperty(value = "用户id")
     @TableField("USER_ID")

src/main/java/com/winhc/repal/entity/RepalRemindHistory.java

@@ -29,9 +29,9 @@ public class RepalRemindHistory implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "用户ID")
-    @TableField("USER_ID")
-    private Long userId;
+    @ApiModelProperty(value = "客户ID")
+    @TableField("CUST_ID")
+    private Long custId;
 
     @ApiModelProperty(value = "账本ID")
     @TableField("REPAL_BOOK_ID")

src/main/java/com/winhc/repal/enums/Dict.java

@@ -130,6 +130,11 @@ public class Dict {
     }
 
     public enum COUNT_QUERY_ENUM {
+        /**
+         * 1 账款详情
+         * 2 客户详情
+         * 3 智能监测
+         */
         账款(1),客户(2),用户(3);
 
         private Integer code;

src/main/java/com/winhc/repal/model/dto/RepalCustomerQueryDTO.java

@@ -17,9 +17,6 @@ import lombok.experimental.Accessors;
 @ApiModel("客户/供应商查询")
 public class RepalCustomerQueryDTO extends PageDTO {
 
-    @ApiModelProperty(value = "所属组织id")
-    private Long repalGroupId;
-
     @ApiModelProperty(value = "客户性质 1企业 2个人 3政府事业单位")
     private Integer custProperty;
 

src/main/java/com/winhc/repal/model/dto/RepalRemindHistoryDTO.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel(value="智能提醒历史表入参")
 public class RepalRemindHistoryDTO {
-    @ApiModelProperty(value = "查询类型 1账款 2客户 3用户")
+    @ApiModelProperty(value = "查询类型 1账款详情 2客户管理 3智能监测")
     private Integer queryType;
 
     @ApiModelProperty(value = "客户ID")

src/main/java/com/winhc/repal/model/vo/RepalGroupMemberVO.java

@@ -17,7 +17,7 @@ public class RepalGroupMemberVO {
     private Long id;
 
     @ApiModelProperty(value = "组织id")
-    private Long repalGroupId;
+    private String repalGroupId;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;

src/main/java/com/winhc/repal/model/vo/RepalRemindHistoryVO.java

@@ -23,8 +23,8 @@ public class RepalRemindHistoryVO {
     @ApiModelProperty(value = "ID")
     private Long id;
 
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
+    @ApiModelProperty(value = "客户ID")
+    private Long custId;
 
     @ApiModelProperty(value = "账本ID")
     private Long repalBookId;

src/main/java/com/winhc/repal/repository/RepalCustomerMapper.java

@@ -23,7 +23,7 @@ public interface RepalCustomerMapper extends BaseMapper<RepalCustomer> {
      * @return
      */
     Page<RepalCustomerInfoBO> getCustPage(Page<RepalCustomerInfoBO> page,
-                                          @Param("groupId") Long groupId,
+                                          @Param("groupId") String groupId,
                                           @Param("custProperty")Integer custProperty,
                                           @Param("sortType")Integer sortType,
                                           @Param("custType")Integer custType,

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

@@ -82,14 +82,22 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
     @Autowired
     private RepalRolePermissionService repalRolePermissionService;
 
+    @Autowired
+    private ThirdPartyAccountService thirdPartyAccountService;
+
      @Override
      public VOPage<RepalCustomerInfoVO> find(RepalCustomerQueryDTO dto,UserBean userBean) {
          //权限
          boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                  Dict.custTypeEnum.客户.getCode().equals(dto.getCustType()) ? PermissionEnum.QUERY_ALL_CUST.getCode() : PermissionEnum.QUERY_ALL_SUPPLY.getCode());
+         //反查组织
+         ThirdPartyAccount thirdPartyAccount = thirdPartyAccountService.getOne(Wrappers.lambdaQuery(ThirdPartyAccount.class).eq(ThirdPartyAccount::getUserId,userBean.getUserId()).eq(ThirdPartyAccount::getAppId,0).eq(ThirdPartyAccount::getDeleted, Dict.DeletedStatusEnunm.否.getCode()),false);
+         if(ObjectUtil.isNull(thirdPartyAccount)){
+             return new VOPage<>();
+         }
          Page<RepalCustomerInfoBO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
          int billType = Dict.custTypeEnum.客户.getCode().equals(dto.getCustType()) ? RepalBillTypeEnum.RECEIVABLE.getCode() : RepalBillTypeEnum.RECEIPT.getCode();
-         page = repalCustomerMapper.getCustPage(page, dto.getRepalGroupId(),dto.getCustProperty(),dto.getSortType(),dto.getCustType(),billType,allFlag,userBean.getUserId());
+         page = repalCustomerMapper.getCustPage(page, thirdPartyAccount.getGroupId(),dto.getCustProperty(),dto.getSortType(),dto.getCustType(),billType,allFlag,userBean.getUserId());
          VOPage<RepalCustomerInfoVO> result = new VOPage<>(dto.getPageNum(), dto.getPageSize(), page.getTotal(), new ArrayList<>());
          if(CollUtil.isEmpty(page.getRecords())){
              return result;
@@ -151,15 +159,13 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
             throw new CommonException(CodeMsg.FAILED,"暂无此权限，可联系超级管理员在我的-成员管理页面开通");
         }
         //查组织id
-        RepalGroupMember repalGroupMember = repalGroupMemberService.getOne(Wrappers.lambdaQuery(RepalGroupMember.class)
-                .eq(RepalGroupMember::getUserId,userBean.getUserId())
-                .eq(RepalGroupMember::getDeleted,Dict.DeletedStatusEnunm.否.getCode()),false);
-        if(ObjectUtil.isNull(repalGroupMember)){
+        ThirdPartyAccount thirdPartyAccount = thirdPartyAccountService.getOne(Wrappers.lambdaQuery(ThirdPartyAccount.class).eq(ThirdPartyAccount::getUserId,userBean.getUserId()).eq(ThirdPartyAccount::getAppId,0).eq(ThirdPartyAccount::getDeleted, Dict.DeletedStatusEnunm.否.getCode()),false);
+        if(ObjectUtil.isNull(thirdPartyAccount)){
             throw new CommonException(CodeMsg.FAILED,"您还未加入该组织，请联系超级管理员");
         }
          RepalCustomer repalCustomer = new RepalCustomer();
          BeanUtils.copyProperties(dto,repalCustomer);
-         repalCustomer.setRepalGroupId(repalGroupMember.getRepalGroupId());
+         repalCustomer.setRepalGroupId(thirdPartyAccount.getGroupId());
          //校验非空字段
          if(StrUtil.isBlank(dto.getCustName())){
              throw new CommonException(CodeMsg.FAILED,"客户名不能为空");
@@ -217,12 +223,6 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
         if(!allFlag){
             throw new CommonException(CodeMsg.FAILED,"暂无此权限，可联系超级管理员在我的-成员管理页面开通");
         }
-        RepalGroupMember repalGroupMember = repalGroupMemberService.getOne(Wrappers.lambdaQuery(RepalGroupMember.class)
-                .eq(RepalGroupMember::getUserId,userBean.getUserId())
-                .eq(RepalGroupMember::getDeleted,Dict.DeletedStatusEnunm.否.getCode()),false);
-        if(ObjectUtil.isNull(repalGroupMember)){
-            throw new CommonException(CodeMsg.FAILED,"您还未加入该组织，请联系超级管理员");
-        }
         RepalCustomer repalCustomer = getById(dto.getCustId());
         if(ObjectUtil.isNull(repalCustomer)){
             throw new CommonException(CodeMsg.FAILED,"客户或供应商不存在");

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

@@ -25,6 +25,7 @@ import com.winhc.repal.repository.RepalRemindHistoryMapper;
 import com.winhc.repal.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.winhc.repal.util.RedisUtil;
+import com.winhc.repal.util.UserContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,6 +70,8 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
     private RepalCustomerService repalCustomerService;
     @Autowired
     private RepalBookService repalBookService;
+    @Autowired
+    private RepalRolePermissionService repalRolePermissionService;
 
     @Override
     public RepalBillRemindUnReadVO getRemindUnReadVO(List<RepalBill> repalBills,Long userId) {
@@ -116,7 +119,7 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                 changeStr1 = "提高";
             }
             RepalRemindHistory accountRemindHistory = new RepalRemindHistory();
-            accountRemindHistory.setUserId(repalBill.getUserId())
+            accountRemindHistory.setCustId(Long.parseLong(repalBill.getCustomerId()))
                     .setRepalBookId(repalBill.getRepalBookId())
                     .setRepalBillId(repalBill.getId())
                     .setTrendId(diagnosis.getId().toString())
@@ -302,6 +305,8 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
 
     @Override
     public VOPage<RepalRemindHistoryVO> find(RepalRemindHistoryDTO dto, Integer pageNum, Integer pageSize, UserBean userBean) {
+        //权限
+        boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),PermissionEnum.QUERY_ALL_URGE.getCode());
         //参数校验
         if(ObjectUtil.isNull(dto.getQueryType())){
             throw new CommonException(CodeMsg.VALIDATE_PARAMETER);
@@ -403,6 +408,7 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                 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()));
                 Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity()));
                 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());
                 IPage<RepalRemindHistory> pageAccountRemindHistory = page(new Page<>(pageNum, pageSize), qw);
                 if(CollUtil.isNotEmpty(pageAccountRemindHistory.getRecords())){
                     result = new VOPage<>(pageNum, pageSize, pageAccountRemindHistory.getTotal(), pageAccountRemindHistory.getRecords().stream()

src/main/java/com/winhc/repal/task/SmartRemindTask.java

@@ -155,7 +155,7 @@ public class SmartRemindTask {
                             RepalRemindHistory accountRemindHistory = accountRemindHistoryService.getOne(remindHistoryQueryWrapper, false);
                             if (accountRemindHistory == null) {
                                 RepalRemindHistory newRemind = new RepalRemindHistory();
-                                newRemind.setUserId(e.getUserId());
+                                newRemind.setCustId(Long.parseLong(e.getCustomerId()));
                                 newRemind.setRepalBookId(e.getRepalBookId());
                                 newRemind.setRepalBillId(e.getId());
                                 newRemind.setTrendId(e.getDiagnosisId() == null ? "" : e.getDiagnosisId() + "");
@@ -209,7 +209,7 @@ public class SmartRemindTask {
                                 dynamics.getDataList().forEach(financeDynamicVO -> {
                                     //新增动态提醒
                                     RepalRemindHistory accountRemindHistory = new RepalRemindHistory();
-                                    accountRemindHistory.setUserId(e.getUserId())
+                                    accountRemindHistory.setCustId(Long.parseLong(e.getCustomerId()))
                                             .setRepalBookId(e.getRepalBookId())
                                             .setRepalBillId(e.getId())
                                             .setTrendId(financeDynamicVO.getId())
@@ -278,7 +278,7 @@ public class SmartRemindTask {
                                     //新增动态提醒
                                     String titleString = RISK_MAP.get(type);
                                     RepalRemindHistory accountRemindHistory = new RepalRemindHistory();
-                                    accountRemindHistory.setUserId(e.getUserId())
+                                    accountRemindHistory.setCustId(Long.parseLong(e.getCustomerId()))
                                             .setRepalBookId(e.getRepalBookId())
                                             .setRepalBillId(e.getId())
                                             .setTrendId(esDynamic.getId())