From 3be9f7b2cd2150fd07adacdb4d5bcf95488b298b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 1 Nov 2021 14:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41796?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java    | 12 ++---
 .../impl/PaySpendingContractServiceImpl.java  |  6 +--
 .../xml/PayPackCompanyProjectMapper.xml       |  2 +-
 .../impl/PayPaymentRecordServiceImpl.java     | 53 ++++++++++---------
 .../controller/PayWorkingGroupController.java |  4 +-
 .../PayWorkingGroupDataFileController.java    |  8 +--
 .../PayWorkingGroupSubItemController.java     |  6 +--
 7 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 7d94d1de..e87d35eb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -253,7 +253,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
-            throw new JeroBootException("收入合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         // 项目已打包
         if(Objects.equals(payIncomeContractStatus.getPack(),PayIncomeContractCommon.PACK1)){
@@ -320,7 +320,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
-            throw new JeroBootException("收入合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         if(Objects.isNull(payIncomeContract.getAmountReceived())){
             payIncomeContract.setAmountReceived(new BigDecimal("0.00"));
@@ -594,7 +594,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
-            throw new JeroBootException("收入合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         // 查看项目类型
         switch (String.valueOf(payIncomeContractAssociated.getProjectType())){
@@ -746,7 +746,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractNew.getPrincipalId())){
-            throw new JeroBootException("收入合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         // 验证合同状态是否为草稿或者未通过
         if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS2)
@@ -1004,7 +1004,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
-            throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可操作！");
+            throw new JeroBootException(payIncomeContractStatus.getContractName() + "数据权限不足！");
         }
         if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
                 && !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
@@ -1036,7 +1036,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         StringBuilder msg1 = new StringBuilder();
         listPayIncomeContractStatus.forEach(p->{
             if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),p.getPrincipalId())){
-                msg.append(p.getContractName() + "收入合同不可操作！");
+                msg.append(p.getContractName() + "数据权限不足！");
             }
             if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
                     && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 7dce3fdb..d6e9fc69 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -210,7 +210,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
-            throw new JeroBootException("支出合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         List<PaySpendingContractInstallment> listPaySpendingContractInstallment = new ArrayList<>();
         if(!CollectionUtils.isEmpty(input.getInstallment())){
@@ -276,7 +276,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
-            throw new JeroBootException("支出合同不可操作！");
+            throw new JeroBootException("数据权限不足！");
         }
         paySpendingContractService.removeById(id);
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
@@ -298,7 +298,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
             listPaySpendingContractStatus.forEach(p->{
                 if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){
-                    msg.append(p.getContractName() + "支出合同不可操作！");
+                    msg.append(p.getContractName() + "数据权限不足！");
                 }
             });
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
index 30ebd739..82c6f1a3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
@@ -177,7 +177,7 @@
         from pay_meeting meeting
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
         <where>
-            sit.register_check_result != 0
+            sit.check_result = 1
             <if test="projectId != null and projectId != ''">
                 AND sit.id = #{projectId}
             </if>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 90176d61..caf14615 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -167,6 +167,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 if(Objects.isNull(payCommonProject)){
                     throw new JeroBootException("项目不存在，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 principalId = payCommonProject.getPrincipalId();
                 project = payCommonProject.getChargeProject();
                 receivableAmount = payCommonProject.getReceivableAmount();//应收
@@ -184,10 +188,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
-                PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
-                if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
-                }
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -199,6 +199,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 if(Objects.isNull(payWorkingGroup)){
                     throw new JeroBootException("工作组不存在，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(payWorking.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 principalId = payWorkingGroup.getPrincipalIdA();
                 project = payWorkingGroup.getWorkingGroupProject();
                 receivableAmount = payWorking.getReceivableAmount();//应收
@@ -217,10 +221,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前款金额，不可提交！");
                 }
-                PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(payWorking.getChargeCompanyTemporaryId());
-                if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
-                }
+
                 break;
             //会议项目
             case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -232,6 +233,14 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 if(Objects.isNull(payMeeting)){
                     throw new JeroBootException("会议不存在，不可提交！");
                 }
+                // 会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以开票 (0未审核,1已通过)
+                if(Objects.equals(meeting.getRegisterCheckResult(),0)){
+                    throw new JeroBootException("报名信息未审核，需要审核后来款");
+                }
+                PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
+                if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 principalId = payMeeting.getDirectorId();
                 project = payMeeting.getMeetingName();
                 receivableAmount = meeting.getAmountReceivable();//应收
@@ -250,14 +259,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
-                // 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以开票 (0未审核,1已通过)
-                if(Objects.equals(meeting.getRegisterCheckResult(),0)){
-                    throw new JeroBootException("报名信息未审核，需要审核后来款");
-                }
-                PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
-                if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
-                }
+
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -269,6 +271,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 if(Objects.isNull(payMemberProject)){
                     throw new JeroBootException("会员项目不存在，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(member.getCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 principalId = payMemberProject.getDirectorId();
                 project = payMemberProject.getProjectName();
                 receivableAmount = member.getAmountReceivable();//应收
@@ -288,10 +294,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
-                PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(member.getCompanyTemporaryId());
-                if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
-                }
+
                 break;
             //标协会员
             case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -301,7 +304,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
                 receivableAmount = tbMember.getAmountReceivable();//应收
                 paidAmount=tbMember.getPaidAmount();//实收
-
+                PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMember.getCompanyId());
+                if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 //是否还能再添加来款
                 isAdd = isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
                 if(isAdd){
@@ -321,10 +327,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
-                PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMember.getCompanyId());
-                if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
-                }
+
                 break;
             default:break;
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 6f0f6aa8..7013f518 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -250,7 +250,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		 }
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 if(!rolePermissionService.getRolePermission("workingGroupProject:copy") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
-			 return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
+			 return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
 		 }
 		 payWorkingGroupService.copy(payWorkingGroup);
 		 return Result.OK("复制成功！");
@@ -313,7 +313,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
-			return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
+			return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
 		}
 		try {
 			// 编辑保存前再次校验来款项目是否存在
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
index 6f78c00f..b252be53 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
@@ -96,7 +96,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			if(!rolePermissionService.getRolePermission("fileMaintenance:search")
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-				throw new JeroBootException("资料不可操作！");
+				throw new JeroBootException("数据权限不足！");
 			}
 		}
 
@@ -192,7 +192,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			if(!rolePermissionService.getRolePermission("fileMaintenance:delete")
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-				throw new JeroBootException("资料不可操作！");
+				throw new JeroBootException("数据权限不足！");
 			}
 		}
 		payWorkingGroupDataFileService.removeById(id);
@@ -231,7 +231,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 					if(!rolePermissionService.getRolePermission("fileMaintenance:batchDel")
 							&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 							&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-						throw new JeroBootException("资料不可操作！");
+						throw new JeroBootException("数据权限不足！");
 					}
 				}
 			}
@@ -297,7 +297,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			if(!rolePermissionService.getRolePermission("fileMaintenance:export")
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-				throw new JeroBootException("资料不可操作！");
+				throw new JeroBootException("数据权限不足！");
 			}
 		}
 		// Step.1 组装查询条件
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 57f97dfa..4e3ce5ac 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -122,7 +122,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(!rolePermissionService.getRolePermission("workingGroupMember:search")
 		 	&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 		 	&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-			 return Result.error("工作组成员不可操作！");
+			 return Result.error("数据权限不足！");
 		 }
 		 Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
 		 IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate);
@@ -334,7 +334,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(!rolePermissionService.getRolePermission("workingGroupMember:setDunningReminder")
 				 && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 				 && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-			 throw new JeroBootException("工作组成员不可操作！");
+			 throw new JeroBootException("数据权限不足！");
 		 }
 
 		 List<String> listContacts = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList());
@@ -497,7 +497,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(!rolePermissionService.getRolePermission("workingGroupMember:export")
 				 && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
 				 && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
-			 throw new JeroBootException("工作组成员不可操作！");
+			 throw new JeroBootException("数据权限不足！");
 		 }
 		 return super.exportXls(request, payWorkingGroupSubItem, PayWorkingGroupSubItem.class, "工作组成员");
 	 }