Merge branch 'branch20211008' into xuqiubiangeng1026

# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
#	jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java

@@ -96,8 +96,9 @@ public class AuthenticationUtils {
     public static void checkResult(String response) {
         JSONObject jsonObject = JSONObject.parseObject(response);
         String code = jsonObject.getString("code");
+        String message = jsonObject.getString("message");
         if (!"200".equals(code)){
-            throw new JeroBootException("数据同步失败！");
+            throw new JeroBootException("数据同步失败！"+message);
         }
     }
 
@@ -136,4 +137,21 @@ public class AuthenticationUtils {
         String post = HttpUtil.post(urlBuilder.toString(), paramMap);
         checkResult(post);
     }
+
+    /**
+     * 调用会员系统get接口
+     * @param methodName
+     */
+    public static void get(String methodName, HashMap<String, Object> paramMap) {
+        Map<String, String> stringStringMap = encryptByRsaPriKey();
+        paramMap.put("pushToken", stringStringMap.get("token"));
+        paramMap.put("publicKey", stringStringMap.get("publicKey"));
+        //拼接url路径
+        StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL);
+        urlBuilder.append(methodName);
+        urlBuilder.append("?");
+        paramMap.forEach((k,v) -> urlBuilder.append(k).append("=").append(v).append("&"));
+        String get = HttpUtil.get(urlBuilder.toString());
+        checkResult(get);
+    }
 }

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java

@@ -66,6 +66,22 @@ public class ValidUtil {
         return list;
     }
 
+    /**
+     * 手动校验@Vaild并抛出异常信息list
+     *
+     * @param object 待校验对象
+     * @param groups 待校验的组
+     * @return errorList
+     */
+    public static List<String> validateReturnListWithNum(Object object, int errorRowNum, Class<?>... groups){
+        List<String> list = new ArrayList<>();
+        Set<ConstraintViolation<Object>> set = validator.validate(object, groups);
+        for (ConstraintViolation<Object> constraintViolation : set) {
+            list.add("第" + errorRowNum + "行："+constraintViolation.getMessage());
+        }
+        return list;
+    }
+
     /**
      * @Description 校验全部数据格式
      * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java

@@ -99,7 +99,7 @@ public class ProjectPackServiceImpl implements ProjectPackService {
                     throw new JeroBootException("企业不匹配！");
                 }
                 //审核不通过不允许打包
-                if (!Objects.equals(payMeetingSituationOld.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
+                if (!Objects.equals(payMeetingSituationOld.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
                     throw new JeroBootException("项目未审核通过！");
                 }
                 LambdaUpdateWrapper<PayMeetingSituation> payMeetingSituation = new LambdaUpdateWrapper<>();

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java

@@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService {
         if(!Objects.isNull(map)) {
             // 替换企业端系统url与小程序名称
             // todo 替换系统地址，小程序名称
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
+                    ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
-                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){
+                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())
+                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){
                 map.put("systemAddress",env.getProperty("message.systemUrl"));
                 map.put("wxName",env.getProperty("message.wxName"));
             }

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -816,6 +816,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
 			status = PayCompanyManagementCommon.STATUS1;
 		}
+		List<Object> excelData = super.getExcelData(request, PayCompanyManagement.class);
+		if (excelData.isEmpty()) {
+			throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
+		}
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -17,6 +17,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -42,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -201,10 +203,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			 if (!StringUtils.isBlank(payContactsManagement.getEmail())){
 				 payContactsManagement.setEmail(PasswordUtil.encrypt(payContactsManagement.getEmail()));
 			 }
-			 String salt = oConvertUtils.randomGen(8);
-			 String passwordEncode = PasswordUtil.encrypt(payContactsManagement.getPhone(), defaultPassword, salt);
-			 payContactsManagement.setSalt(salt);
-			 payContactsManagement.setPassword(passwordEncode);
 		 }catch (Exception e){
 			 log.error("手机号、邮箱加密异常！",e);
 		 }
@@ -634,17 +632,45 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 @ApiOperation(value="联系人管理-通过id查询-会议对外开放接口", notes="联系人管理-通过id查询-会议对外开放接口")
 	 @GetMapping(value = "/queryByIdMeeting")
 	 public Result<?> queryByIdMeeting(@RequestParam(name="id") String id) {
-		 PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
+			 PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
-		 if(payContactsManagement == null) {
+			 if (payContactsManagement == null) {
-			 return Result.error("未找到对应数据");
+				 return Result.error("未找到对应数据");
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
+				 payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
+				 payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+			 }
+			 return Result.OK(payContactsManagement);
+	 }
+
+
+	 /**
+	  * 企业端通过id查询联系人信息
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @ApiOperation(value="企业端-通过id查询联系人信息", notes="企业端-通过id查询联系人信息")
+	 @GetMapping(value = "/queryByIdGetContract")
+	 public Result<?> queryByIdGetContract(@RequestParam(name="id") String id) {
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(sysUser.getId().equals(id)) {
+			 PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
+			 if (payContactsManagement == null) {
+				 return Result.error("未找到对应数据");
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
+				 payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
+				 payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+			 }
+			 return Result.OK(payContactsManagement);
+		 }else{
+		 	return Result.OK("权限异常");
 		 }
-		 if (!StringUtils.isBlank(payContactsManagement.getPhone())){
-			 payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-		 }
-		 if (!StringUtils.isBlank(payContactsManagement.getEmail())){
-			 payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-		 }
-		 return Result.OK(payContactsManagement);
 	 }
 
 	/**
@@ -799,6 +825,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		List<Object> excelData = super.getExcelData(request, PayContactsManagement.class);
+		if (excelData.isEmpty()) {
+			throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
+		}
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -585,6 +585,10 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		if(Objects.equals(chargeStatus,PayIncomeContractCommon.CHARGE_STATUS0)){
 			chargeStatus = "";
 		}
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+			payIncomeContract.setPrincipalId(sysUser.getId());
+		}
 		List<PayIncomeContract> pageList = payIncomeContractService.queryList( payIncomeContract,chargeStatus,projectName,startTime,endTime);
 		List<PayIncomeContract> exportList = null;
 
@@ -596,6 +600,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		} else {
 			exportList = pageList;
 		}
+
 		List<Map<String,String>> list = new ArrayList<>();
 		// excel字段长度
 		Map<String,Integer> mapCount = new HashMap<>();

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java

@@ -3,11 +3,9 @@ package com.jero.contract.controller;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -23,7 +21,6 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oConvertUtils;
-import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.contract.entity.*;
 import com.jero.contract.service.IPaySpendingContractAuditService;
 import com.jero.contract.service.IPaySpendingContractInstallmentService;
@@ -322,8 +319,11 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 								  @RequestParam(name="startTime",required = false) String startTime,
 								  @RequestParam(name="endTime",required = false) String endTime) {
 
-
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		List<PaySpendingContract> pageList = paySpendingContractService.queryList( paySpendingContract.getContractNum(),
+		if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+			paySpendingContract.setPrincipalId(sysUser.getId());
+		}
+		List<PaySpendingContract> pageList = paySpendingContractService.queryList(paySpendingContract.getPrincipalId(), paySpendingContract.getContractNum(),
 				paySpendingContract.getContractName(),startTime,endTime);
 		List<PaySpendingContract> exportList = null;
 
@@ -352,7 +352,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 					map.put("terminationDate",DateUtils.date2Str(p.getTerminationDate(),new SimpleDateFormat("yyyy-MM-dd")));
 					map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening())));
 					map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus())));
-					map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack())));
 					List<PaySpendingContractInstallment> listSub = listPaySpendingContractInstallment.stream().filter(item->
 							Objects.equals(p.getId(),item.getContractId())).collect(Collectors.toList());
 					if(!CollectionUtils.isEmpty(listSub)){

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java

@@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable {
     @ApiModelProperty(value = "合同约定主要时点")
     @Size(max = 200, message = "合同约定主要时点不能大于200个字符")
     private String contractTimePoints;
-	/**应付金额*/
+	/**应收金额*/
-	@Excel(name = "应付金额", width = 15)
+	@Excel(name = "应收金额", width = 15)
-    @ApiModelProperty(value = "应付金额")
+    @ApiModelProperty(value = "应收金额")
-    @NotNull(message = "应付金额不能为空")
+    @NotNull(message = "应收金额不能为空")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @DecimalMax(value = "9999999999.99",message = "应付金额格式错误")
+    @DecimalMax(value = "9999999999.99",message = "应收金额格式错误")
     private BigDecimal accountsReceivableAmount;
-	/**已付金额*/
+	/**已收金额*/
-	@Excel(name = "已付金额", width = 15)
+	@Excel(name = "已收金额", width = 15)
-    @ApiModelProperty(value = "已付金额")
+    @ApiModelProperty(value = "已收金额")
-    @NotNull(message = "已付金额不能为空")
+    @NotNull(message = "已收金额不能为空")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @DecimalMax(value = "9999999999.99",message = "已付金额格式错误")
+    @DecimalMax(value = "9999999999.99",message = "已收金额格式错误")
     private BigDecimal amountReceived;
-	/**未付金额*/
+	/**未收金额*/
-	@Excel(name = "未付金额", width = 15)
+	@Excel(name = "未收金额", width = 15)
-    @ApiModelProperty(value = "未付金额")
+    @ApiModelProperty(value = "未收金额")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @DecimalMax(value = "9999999999.99",message = "未付金额格式错误")
+    @DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
     private BigDecimal outstandingAmount;
 	/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
 	@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java

@@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable {
     @NotEmpty(message = "阶段不能为空")
     @Size(max = 50, message = "阶段长度不能大于50个字符")
     private String phaseName;
-	/**应付金额*/
+	/**应收金额*/
-	@Excel(name = "阶段应付金额", width = 15)
+	@Excel(name = "阶段应收金额", width = 15)
-    @ApiModelProperty(value = "应付金额")
+    @ApiModelProperty(value = "应收金额")
-    @NotNull(message = "阶段应付不能为空")
+    @NotNull(message = "阶段应收不能为空")
-    @DecimalMax(value = "9999999999.99",message = "阶段应付格式错误")
+    @DecimalMax(value = "9999999999.99",message = "阶段应收格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal accountsReceivableAmount;
-	/**应付时间*/
+	/**应收时间*/
-	@Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd")
+	@Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "应付时间")
+    @ApiModelProperty(value = "应收时间")
     private Date accountsReceivableTime;
-	/**实付金额*/
+	/**实收金额*/
-	@Excel(name = "阶段实付金额", width = 15)
+	@Excel(name = "阶段实收金额", width = 15)
-    @ApiModelProperty(value = "阶段实付金额")
+    @ApiModelProperty(value = "阶段实收金额")
-    @DecimalMax(value = "9999999999.99",message = "阶段实付格式错误")
+    @DecimalMax(value = "9999999999.99",message = "阶段实收格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal paidAmount;
-	/**实付时间*/
+	/**实收时间*/
-	@Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd")
+	@Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "实付时间")
+    @ApiModelProperty(value = "实收时间")
     private Date paidTime;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java

@@ -36,7 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContrac
      * @Return
      * @Exception
      */
-    List<PaySpendingContract> queryList(@Param("contractNum") String contractNum,
+    List<PaySpendingContract> queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum,
                                         @Param("contractName") String contractName,@Param("startTime") String startTime,
                                         @Param("endTime") String endTime);
 

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -293,6 +293,9 @@
             <if test="projectName != null and projectName != ''">
                 AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
             </if>
+            <if test="payIncomeContract.principalId != null and payIncomeContract.principalId != ''">
+                AND aa.principalId = #{payIncomeContract.principalId}
+            </if>
         </where>
         ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
     </select>

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml

@@ -117,6 +117,9 @@
             <if test="endTime != null and endTime != ''">
                 AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
+            <if test="principalId != null and principalId != ''">
+                AND principal_id = #{principalId}
+            </if>
         </where>
         ORDER BY chargeStatus desc,create_time desc
     </select>

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -344,9 +344,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                         });
                         int count1 = count - listSpendingContract.size();
                         if(count1 != 0){
-                            Pattern p = Pattern.compile("[0-9]*");
+                            if (count1 % 5 != 0){
-                            Matcher m = p.matcher(String.valueOf(count1 / 5));
-                            if (!m.matches()){
                                 throw new JeroBootException("文件格式有误,请下载模板后上传！");
                             }
                             int count2 = count1 / listSpendingContractInstallment.size();
@@ -570,8 +568,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
     }
 
     @Override
-    public List<PaySpendingContract> queryList(String contractNum, String contractName, String startTime, String endTime) {
+    public List<PaySpendingContract> queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) {
-        return paySpendingContractMapper.queryList( contractNum,  contractName,  startTime,  endTime);
+        return paySpendingContractMapper.queryList(principalId, contractNum,  contractName,  startTime,  endTime);
     }
 
     @Override

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java

@@ -132,7 +132,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		 byte[] buff = new byte[1024];
 		 BufferedInputStream bis = null;
 		 // 读取filename
-		 bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+url)));
+		 bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+File.separator+url)));
 		 int i = bis.read(buff);
 		 while (i != -1) {
 			 outputStream.write(buff, 0, buff.length);

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -41,6 +41,8 @@ import com.jero.member.mapper.PayMemberProjectMapper;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbMemberProjectMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
@@ -109,6 +111,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private IPayCompanyManagementService payCompanyManagementService;
     @Resource
     private IPayPaymentRecordService payPaymentRecordService;
+    @Resource
+    private ISysUserService sysUserService;
 
 
     @Override
@@ -545,16 +549,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
                 //查父表
                 PayMeeting payMeeting = payMeetingMapper.selectById(meeting.getMeetingId());
+                LambdaQueryWrapper<SysUser> queryPayMeetingSysUser = new LambdaQueryWrapper<>();
+                queryPayMeetingSysUser.eq(SysUser::getId,payMeeting.getDirectorId());
+                List<SysUser> sysPayMeetingUser = sysUserService.list(queryPayMeetingSysUser);
                 //逗号拼接邮寄信息
                 if(i==0){
                     projectName.append(payMeeting.getMeetingName());
                     chargeCompanyName.append(meeting.getCompanyName());
-                    principalName.append(payMeeting.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMeetingUser)) {
+                        principalName.append(sysPayMeetingUser.get(0).getRealname());
+                    }
                     principalId.append(payMeeting.getDirectorId());
                 }else{
                     projectName.append(",").append(payMeeting.getMeetingName());
                     chargeCompanyName.append(",").append(meeting.getCompanyName());
-                    principalName.append(",").append(payMeeting.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMeetingUser)) {
+                        principalName.append(",").append(sysPayMeetingUser.get(0).getRealname());
+                    }
                     principalId.append(",").append(payMeeting.getDirectorId());
                 }
                 break;
@@ -572,16 +583,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
                 //查父表
                 PayMemberProject payMemberProject = payMemberProjectMapper.selectById(memberProject.getProjectId());
+                LambdaQueryWrapper<SysUser> queryPayMemberProjectSysUser = new LambdaQueryWrapper<>();
+                queryPayMemberProjectSysUser.eq(SysUser::getId,payMemberProject.getDirectorId());
+                List<SysUser> sysPayMemberProjectUser = sysUserService.list(queryPayMemberProjectSysUser);
                 //逗号拼接邮寄信息
                 if(i==0){
                     projectName.append(payMemberProject.getProjectName());
                     chargeCompanyName.append(memberProject.getCompanyName());
-                    principalName.append(payMemberProject.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) {
+                        principalName.append(sysPayMemberProjectUser.get(0).getRealname());
+                    }
                     principalId.append(payMemberProject.getDirectorId());
                 }else{
                     projectName.append(",").append(payMemberProject.getProjectName());
                     chargeCompanyName.append(",").append(memberProject.getCompanyName());
-                    principalName.append(",").append(payMemberProject.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) {
+                        principalName.append(",").append(sysPayMemberProjectUser.get(0).getRealname());
+                    }
                     principalId.append(",").append(payMemberProject.getDirectorId());
                 }
                 break;

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
@@ -331,7 +332,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
     @ApiOperation(value = "发布提醒", notes = "发布提醒")
     @PostMapping(value = "/publishReminder")
     public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
-        payMeetingService.publishReminder(publishReminderVO);
+        payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13");
         return Result.OK();
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java

@@ -8,8 +8,10 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -19,7 +21,9 @@ import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.meeting.common.MeetingCommon;
+import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.entity.PayMeetingSituation;
+import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.meeting.vo.*;
 import com.jero.meeting.vo.excel.*;
@@ -28,6 +32,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
@@ -56,11 +61,15 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @Resource
     private IPayMeetingSituationService payMeetingSituationService;
     @Resource
-    private AuthenticationUtils authenticationUtils;
-    @Resource
     private IPayContactsManagementService contactsManagementService;
     @Resource
     private IPayCompanyManagementService companyManagementService;
+    @Resource
+    private IPayMeetingService meetingService;
+    @Resource
+    private RolePermissionService rolePermissionService;
+
+    private final Integer MEETING_TYPE = MeetingCommon.COMMITTEE_MEETING_INT;
     /**
      * 分页列表查询
      */
@@ -72,20 +81,29 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
+        String meetingId = payMeetingSituation.getMeetingId();
+        if (StringUtils.isBlank(meetingId)) {
+            throw new JeroBootException("会议id不能为空");
+        }
         QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
         String particularYear = req.getParameter("particularYear");
-        if (StringUtils.isNotBlank(particularYear)){
+        if (StringUtils.isNotBlank(particularYear)) {
-            queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
+            queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear);
         }
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!rolePermissionService.getRolePermission("committeeMeetingSituation:search")) {
+            queryWrapper.eq("pm.director_id", loginUser.getId());
+        }
+        queryWrapper.eq("pm.meeting_type",MEETING_TYPE);
         Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
         IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
         List<PayMeetingSituation> situationList = pageList.getRecords();
         for (PayMeetingSituation meetingSituation : situationList) {
             Integer payMode = meetingSituation.getPayMode();
             //汇款并且缴费凭证为空
-            if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){
+            if (Objects.equals(payMode, 1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
                 meetingSituation.setIdentification(PayProjectCommon.YES);
-            }else {
+            } else {
                 meetingSituation.setIdentification(PayProjectCommon.NO);
             }
         }
@@ -100,6 +118,11 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody PayMeetingSituation payMeetingSituation) {
+        String meetingId = payMeetingSituation.getMeetingId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        if (!Objects.equals(payMeeting.getMeetingType(),MEETING_TYPE)){
+            throw new JeroBootException("数据权限不足");
+        }
         payMeetingSituationService.add(payMeetingSituation);
         return Result.OK("添加成功！");
     }
@@ -124,6 +147,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
+        payMeetingSituationService.checkCan(payMeetingSituationVO.getId(),MEETING_TYPE);
         payMeetingSituationService.editById(payMeetingSituationVO);
         return Result.OK("编辑成功!");
     }
@@ -136,6 +160,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除")
     @GetMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id") String id) {
+        payMeetingSituationService.checkCan(id,MEETING_TYPE);
         payMeetingSituationService.deleteById(id);
         return Result.OK("删除成功!");
     }
@@ -148,7 +173,11 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除")
     @GetMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
-        this.payMeetingSituationService.deleteByIds(Arrays.asList(ids.split(",")));
+        List<String> stringList = Arrays.asList(ids.split(","));
+        for (String id : stringList) {
+            payMeetingSituationService.checkCan(id,MEETING_TYPE);
+        }
+        this.payMeetingSituationService.deleteByIds(stringList);
         return Result.OK("批量删除成功!");
     }
 
@@ -160,6 +189,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id") String id) {
+        payMeetingSituationService.checkCan(id,MEETING_TYPE);
         PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryById(id);
         if (payMeetingSituation == null) {
             return Result.error("未找到对应数据");
@@ -188,6 +218,11 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @RequiresPermissions("committeeMeetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
+        String meetingId = payMeetingSituation.getMeetingId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        if (!Objects.equals(payMeeting.getMeetingType(),MEETING_TYPE)){
+            throw new JeroBootException("数据权限不足");
+        }
         QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
         List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
         // 过滤选中数据
@@ -277,6 +312,10 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "设置对接人", notes = "设置对接人")
     @PostMapping(value = "/addDock")
     public Result<?> addDock(@RequestBody AddDockVO addDockVO) {
+        List<String> meetingSituationIds = addDockVO.getMeetingSituationIds();
+        for (String id : meetingSituationIds) {
+            payMeetingSituationService.checkCan(id,MEETING_TYPE);
+        }
         payMeetingSituationService.addDock(addDockVO);
         return Result.OK("设置对接人成功!");
     }
@@ -289,6 +328,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "审核付款凭证")
     @PostMapping(value = "/check")
     public Result<?> check(@RequestBody CheckVO checkVO) {
+        payMeetingSituationService.checkCan(checkVO.getId(),MEETING_TYPE);
         payMeetingSituationService.check(checkVO);
         return Result.OK("审核成功!");
     }
@@ -301,6 +341,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     @ApiOperation(value = "审核报名信息")
     @PostMapping(value = "/checkRegister")
     public Result<?> checkRegister(@RequestBody CheckVO checkVO) {
+        payMeetingSituationService.checkCan(checkVO.getId(),MEETING_TYPE);
         payMeetingSituationService.checkRegister(checkVO);
         return Result.OK("审核成功!");
     }
@@ -316,6 +357,4 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
         payMeetingSituationService.mergePayBill(mergePayBillVO);
         return Result.OK("合并开票成功!");
     }
-
-
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java

@@ -246,29 +246,30 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         return Result.OK("编辑成功!");
     }
 
-    /**
+    ///**
-     * 通过id删除
+    // * 通过id删除
-     */
+    //@RequiresPermissions("meeting:delete")
-    @RequiresPermissions("meeting:delete")
+    //@AutoLog(value = "会议管理-通过id删除")
-    @AutoLog(value = "会议管理-通过id删除")
+    //@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
-    @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
+    //@GetMapping(value = "/delete")
-    @GetMapping(value = "/delete")
+    //public Result<?> delete(@RequestParam(name = "id") String id) {
-    public Result<?> delete(@RequestParam(name = "id") String id) {
+    //    payMeetingService.deleteById(id);
-        payMeetingService.deleteById(id);
+    //    return Result.OK("删除成功!");
-        return Result.OK("删除成功!");
+    //}*/
-    }
 
-    /**
+
-     * 批量删除
+
-     */
+    ///**
-    @RequiresPermissions("meeting:batchDel")
+    // * 批量删除
-    @AutoLog(value = "会议管理-批量删除")
+    // */
-    @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
+    //@RequiresPermissions("meeting:batchDel")
-    @GetMapping(value = "/deleteBatch")
+    //@AutoLog(value = "会议管理-批量删除")
-    public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
+    //@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
-        this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
+    //@GetMapping(value = "/deleteBatch")
-        return Result.OK("批量删除成功!");
+    //public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
-    }
+    //    this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
+    //    return Result.OK("批量删除成功!");
+    //}
 
     /**
      * 通过id查询
@@ -426,18 +427,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         return Result.OK("上传资料成功!");
     }
 
-    /**
-     * 发布提醒
-     */
-    @AutoLog("发布提醒")
-    @RequiresPermissions("meeting:publish")
-    @ApiOperation(value = "发布提醒", notes = "发布提醒")
-    @PostMapping(value = "/publishReminder")
-    public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
-        payMeetingService.publishReminder(publishReminderVO);
-        return Result.OK();
-    }
-
     @ApiOperation(value = "生成base64")
     @GetMapping(value = "/createBase64")
     @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java

@@ -45,6 +45,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -145,8 +146,21 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
     @AutoLog(value = "会议管理-通过id删除")
     @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
     @GetMapping(value = "/delete")
+    @Transactional
     public Result<?> delete(@RequestParam(name = "id") String id) {
         extracted(id);
+        payMeetingService.deleteById(id);
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("id",id);
+        AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteIncome",paramMap);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 会员系统删除会议
+     */
+    @GetMapping(value = "/deleteStandard")
+    public Result<?> deleteStandard(@RequestParam(name = "id") String id) {
         payMeetingService.deleteById(id);
         return Result.OK("删除成功!");
     }
@@ -158,12 +172,25 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
     @AutoLog(value = "会议管理-批量删除")
     @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
     @GetMapping(value = "/deleteBatch")
+    @Transactional
     public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
         List<String> idList = Arrays.asList(ids.split(","));
         for (String id : idList) {
             extracted(id);
         }
         this.payMeetingService.deleteByIds(idList);
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("ids",ids);
+        AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteBatchIncome",paramMap);
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 会员系统删除会议
+     */
+    @GetMapping(value = "/deleteBatchStandard")
+    public Result<?> deleteBatchStandard(@RequestParam(name = "ids") String ids) {
+        this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
@@ -332,7 +333,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
     @ApiOperation(value = "发布提醒", notes = "发布提醒")
     @PostMapping(value = "/publishReminder")
     public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
-        payMeetingService.publishReminder(publishReminderVO);
+        payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1");
         return Result.OK();
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml

@@ -155,6 +155,7 @@
     <select id="pageListContract" resultMap="PayMeetingSituationResultMap">
         select distinct pms.*
         from pay_meeting_situation pms
+                     left join pay_meeting pm on pms.meeting_id = pm.id
                      left JOIN pay_payment_record ppr ON ppr.project_id = pms.id
         ${ew.customSqlSegment}
     </select>

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java

@@ -3,6 +3,7 @@ package com.jero.meeting.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.meeting.entity.PayMeeting;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.meeting.vo.PayMeetingVO;
@@ -61,9 +62,8 @@ public interface IPayMeetingService extends IService<PayMeeting> {
      * @param publishReminderVO
 	 * @author lijiarao
 	 * @date 2021/9/27
-	 * @return void
 	 */
-	void publishReminder(PublishReminderVO publishReminderVO);
+	void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType);
 
 
     IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.meeting.common.MeetingCommon;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.meeting.vo.*;
@@ -77,4 +78,6 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 	void editTerminal(PayMeetingSituationVO payMeetingSituationVO);
 
     IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper);
+
+	void checkCan(String situationId, Integer meetingCommon);
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -385,10 +385,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (integer > 0) {
             throw new JeroBootException("该会议有参会人无法删除");
         }
-        PayMeeting payMeeting = getById(id);
-        if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-            stableCrossTrainingService.delete(id);
-        }
         removeById(id);
         LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayMeetingHotelContacts::getMeetingId, id);
@@ -411,12 +407,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (meetingList.size() > 0) {
             throw new JeroBootException(meetingList + "会议下有参会人，无法删除");
         }
-        for (String id : ids) {
-            PayMeeting payMeeting = getById(id);
-            if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                stableCrossTrainingService.delete(id);
-            }
-        }
         removeByIds(ids);
         LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(PayMeetingHotelContacts::getMeetingId, ids);
@@ -441,7 +431,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 
     @Override
     @Transactional
-    public void publishReminder(PublishReminderVO publishReminderVO) {
+    public void publishReminder(PublishReminderVO publishReminderVO,CompanyMessageEnums companyMessageEnums,String busType) {
         List<String> meetingIds = publishReminderVO.getMeetingIds();
         List<String> subitemIds = publishReminderVO.getSubitemIds();
         Integer projectType = publishReminderVO.getProjectType();
@@ -532,9 +522,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
 
                 sendMessageDTO.setFromUser(director.getUsername());
-                sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
+                sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
                 sendMessageDTO.setTemplateParam(map);
-                sendMessageDTO.setBusType("C_OPEN_TYPE1");
+                sendMessageDTO.setBusType(busType);
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("id", meetingId);
                 sendMessageDTO.setBusId(jsonObject.toJSONString());

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -15,6 +15,7 @@ import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -113,6 +114,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
     @Resource
     private IPayIncomeContractService payIncomeContractService;
+    @Resource
+    private RolePermissionService rolePermissionService;
 
     private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime", "departureTime", "checkInHotel"};
 
@@ -121,6 +124,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
      */
     @Override
     public void add(PayMeetingSituation payMeetingSituation) {
+        String meetingId1 = payMeetingSituation.getMeetingId();
+        PayMeeting payMeeting1 = meetingService.getById(meetingId1);
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
+            throw new JeroBootException("只有会议负责人可以新增参会人");
+        }
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
         //payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
         payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
@@ -131,7 +140,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
         // 收入合同创建项目发送消息到项目负责人
         if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
-            PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
+            PayMeeting payMeeting = meetingService.getById(meetingId1);
             contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation1.getCompanyContactName(), payMeetingSituation1.getId(), payMeeting.getDirectorId());
         }
         String meetingId = payMeetingSituation1.getMeetingId();
@@ -674,7 +683,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
     @Override
     public void editTerminal(PayMeetingSituationVO payMeetingSituationVO) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String id = payMeetingSituationVO.getId();
+        PayMeetingSituation payMeetingSituation1 = getById(id);
+        String meetingId = payMeetingSituation1.getMeetingId();
+        String loginUserId = loginUser.getId();
+        //参会人id不是自己
+        if (!Objects.equals(payMeetingSituation1.getCompanyContactId(), loginUserId)) {
+            throw new JeroBootException("不是参会人无法上传缴费凭证");
+        }
         String paymentRecord = payMeetingSituationVO.getPaymentRecord();
         String orderCode = payMeetingSituationVO.getOrderCode();
         PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
@@ -683,8 +700,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation.setOrderCode(orderCode);
 
         updateById(payMeetingSituation);
-        PayMeetingSituation payMeetingSituation1 = getById(id);
+
-        String meetingId = payMeetingSituation1.getMeetingId();
         PayMeeting payMeeting = meetingService.getById(meetingId);
         SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
@@ -863,7 +879,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     }
                 }
                 if (!validateReturnList.isEmpty()){
-                    throw new JeroBootException(StringUtils.strip(validateReturnList.toString(),"[]"));
+                    throw new JeroBootException(StringUtils.join(validateReturnList,"，"));
                 }
             }
             BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
@@ -1118,11 +1134,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
         String username = user.getUsername();
         List<String> meetingSituationIds = addDockVO.getMeetingSituationIds();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String sysUserId = sysUser.getId();
         for (String meetingSituationId : meetingSituationIds) {
             PayMeetingSituation payMeetingSituation = getById(meetingSituationId);
             String meetingId = payMeetingSituation.getMeetingId();
             PayMeeting payMeeting = meetingService.getById(meetingId);
             Integer meetingType = payMeeting.getMeetingType();
+            //只有会议负责人可以设置对接人
+            if (!payMeeting.getDirectorId().equals(sysUserId)) {
+                throw new JeroBootException("只有会议负责人可以设置对接人");
+            }
             //只有国际研讨会议可以设置对接人
             if (!meetingType.equals(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING))) {
                 throw new JeroBootException("只有国际研讨会议可以设置对接人");
@@ -1154,4 +1176,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
         return date.after(begin) && date.before(end);
     }
+    @Override
+    public void checkCan(String situationId, Integer meetingCommon){
+        PayMeetingSituation payMeetingSituation = getById(situationId);
+        String meetingId = payMeetingSituation.getMeetingId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        if (!Objects.equals(payMeeting.getMeetingType(),meetingCommon)) {
+            throw new JeroBootException("数据权限不足");
+        }
+    }
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -226,41 +226,41 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         }
         int errorRowNum = 2;
         List<String> errorMessage = new ArrayList<>();
+        //来款方式
+        List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
+        Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
+        //需要发票
+        List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
+        Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
         for (Object obj : excelData) {
             errorRowNum += 1;
             //复制属性
             PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj;
             projectSubitemExcel.setProjectId(projectId);
             PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
-
+            errorMessage.addAll(ValidUtil.validateReturnListWithNum(projectSubitemExcel,errorRowNum));
             //应收金额
             String amountReceivable = projectSubitemExcel.getAmountReceivable();
-            if (!NumberUtil.isNumber(amountReceivable)) {
+            if (errorMessage.isEmpty()) {
-                errorMessage.add("第" + errorRowNum + "行：应收金额格式错误");
-            } else {
                 projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
             }
             //来款方式
-            List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
-            Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String paymentMethod = projectSubitemExcel.getPaymentMethod();
-            if (StringUtils.isBlank(paymentMethod)){
+            if (errorMessage.isEmpty()) {
-                errorMessage.add("第" + errorRowNum + "行：来款方式不能为空");
+                if (paymentTypeMap.containsKey(paymentMethod)) {
-            }else if (paymentTypeMap.containsKey(paymentMethod)) {
+                    projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
-                projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
+                } else {
-            } else {
+                    errorMessage.add("第" + errorRowNum + "行：来款方式格式错误");
-                errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
+                }
             }
             //需要发票
-            List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
-            Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String needInvoice = projectSubitemExcel.getNeedInvoice();
-            if (StringUtils.isBlank(needInvoice)){
+            if (errorMessage.isEmpty()) {
-                errorMessage.add("第" + errorRowNum + "行：需要发票不能为空");
+                if (invoiceTypeMap.containsKey(needInvoice)) {
-            }else if (invoiceTypeMap.containsKey(needInvoice)) {
+                    projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
-                projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
+                } else {
-            } else {
+                    errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
-                errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
+                }
             }
             if (Objects.equals(Integer.parseInt(paymentTypeMap.get(paymentMethod)), PayProjectCommon.CHARGE_WAY2)) {
                 // 合同编号验证
@@ -277,7 +277,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
 
             try {
-                ValidUtil.validate(projectSubitem);
+                //ValidUtil.validate(projectSubitem);
                 memberProjectSubitemService.add(projectSubitem);
             } catch (JeroBootException e) {
                 errorMessage.add("第" + errorRowNum + "行：" + e.getMessage());

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java

@@ -115,7 +115,7 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 企业联系人临时id
      */
-    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
+    @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
     private String companyContactTemporaryId;
 
     /**
@@ -134,7 +134,7 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 邮寄联系人临时id
      */
-    @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
+    @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
     private String postContactTemporaryId;
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java

@@ -30,14 +30,12 @@ import com.jero.member.service.IPayMemberProjectService;
 import com.jero.member.service.IPayMemberProjectSubitemService;
 import com.jero.valid.group.ChargeNotice;
 import com.jero.valid.group.Contract;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
@@ -228,38 +226,52 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 	 * @param payMemberProjectSubitem 会员项目成员
 	 */
 	public void validMemberProjectSubitemAdd(PayMemberProjectSubitem payMemberProjectSubitem) {
+		List<String> errors = new ArrayList<>();
 		// 企业
-		PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
+		try {
-		if(Objects.isNull(chargeCompanyName)){
+			PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
-			throw new JeroBootException("企业名称为空！");
+			if (Objects.isNull(chargeCompanyName)) {
+				throw new JeroBootException("企业名称为空！");
+			}
+			payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
+			payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
+		} catch (JeroBootException e) {
+			errors.add("会员单位不存在");
 		}
-		payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
-		payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
-
 		// 联系人
-		PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
+		try {
-		if(Objects.isNull(contactsName)){
+			PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
-			throw new JeroBootException("联系人名称为空！");
+			if (Objects.isNull(contactsName)) {
+				throw new JeroBootException("联系人名称为空！");
+			}
+			payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
+			payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
+		} catch (JeroBootException e) {
+			errors.add("企业联系人不存在");
 		}
-		payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
+		try {
-		payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
+			// 联系人
-
+			PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
-		// 联系人
+			if (Objects.isNull(postContactsName)) {
-		PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
+				throw new JeroBootException("邮寄联系人为空！");
-		if(Objects.isNull(postContactsName)){
+			}
-			throw new JeroBootException("邮寄联系人为空！");
+			payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId());
+			payMemberProjectSubitem.setPostContactName(postContactsName.getName());
+		} catch (JeroBootException e) {
+			errors.add("邮寄联系人不存在");
 		}
-		payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId());
-		payMemberProjectSubitem.setPostContactName(postContactsName.getName());
 
+		if (!errors.isEmpty()) {
+			throw new JeroBootException(StringUtils.join(errors, "，"));
+		}
 		//校验来款方式
 		Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
 		//合同
-		if (Objects.equals(paymentMethod,2)){
+		if (Objects.equals(paymentMethod, 2)) {
 			ValidUtil.validate(payMemberProjectSubitem, Contract.class);
 		}
 		//收费通知
-		if (Objects.equals(paymentMethod,3)){
+		if (Objects.equals(paymentMethod, 3)) {
 			ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
 		}
 	}

jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java

@@ -40,7 +40,7 @@ public class PayMemberProjectSubitemExcel {
     /**
      * 企业联系人id
      */
-    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2")
+    @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2")
     @ApiModelProperty(value = "企业联系人id")
     @NotBlank(message = "企业联系人不能为空")
     @Size(max = 50, message = "企业联系人最大为50字符")
@@ -49,7 +49,7 @@ public class PayMemberProjectSubitemExcel {
     /**
      * 邮寄联系人id
      */
-    @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3")
+    @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3")
     @ApiModelProperty(value = "邮寄联系人id")
     @NotBlank(message = "邮寄联系人不能为空")
     private String postContactId;
@@ -59,8 +59,8 @@ public class PayMemberProjectSubitemExcel {
      */
     @Excel(name = "应收金额", width = 15,orderNum = "4")
     @ApiModelProperty(value = "应收金额")
-    @NotNull(message = "应收金额不能为空")
+    @NotBlank(message = "应收金额不能为空")
-    @DecimalMax(value = "9999999999.99", message = "应收金额格式错误")
+    @Pattern(regexp = "^[0-9]{1,10}(\\.[0-9]{1,2})?$",message = "应收金额格式错误")
     private String amountReceivable;
 
 
@@ -69,6 +69,7 @@ public class PayMemberProjectSubitemExcel {
      */
     @Excel(name = "来款方式", width = 15, orderNum = "7")
     @ApiModelProperty(value = "来款方式(2:合同，3:收费通知)")
+    @NotBlank(message = "来款方式不能为空")
     private String paymentMethod;
 
     /**
@@ -109,6 +110,7 @@ public class PayMemberProjectSubitemExcel {
      */
     @Excel(name = "需要发票", width = 15, orderNum = "6")
     @ApiModelProperty(value = "需要发票")
+    @NotBlank(message = "需要发票不能为空")
     private String needInvoice;
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml

@@ -30,7 +30,8 @@
         from
         (
             <!-- 普通项目-->
-            select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email
+            select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,
+            if(c.paid_amount is null or c.paid_amount = '','0.00',c.paid_amount) as paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email
             from pay_common_project c
             <where>
                 <if test="companyId != null and companyId != ''">
@@ -45,7 +46,8 @@
             </where>
             <!--工作组项目-->
             UNION ALL
-            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
+            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
+        if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
             from pay_working_group g
             inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
             <where>
@@ -61,7 +63,8 @@
             </where>
             <!-- 会议项目-->
             UNION ALL
-            select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,''
+            select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,
+        if(sit.paid_amount is null or sit.paid_amount = '','0.00',sit.paid_amount) as paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,''
             from pay_meeting meeting
             inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
             <where>
@@ -78,7 +81,8 @@
             </where>
             <!-- 会员项目-->
             UNION ALL
-            select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'',''
+            select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,
+        if(msub.paid_amount is null or msub.paid_amount = '','0.00',msub.paid_amount) as paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'',''
             from pay_member_project pmp
             inner join pay_member_project_subitem msub on pmp.id = msub.project_id
             <where>
@@ -94,7 +98,8 @@
             </where>
             <!-- 标协会员项目-->
             UNION ALL
-            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
+            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
+        if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
             from tb_member_project tmember
             inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
             <where>
@@ -120,7 +125,7 @@
         <if test="paymentDate != null and paymentDate != ''">
             AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
         </if>
-        GROUP BY ppcp.project_id ORDER BY project.paid_amount asc,ppcp.create_time desc
+        GROUP BY ppcp.project_id ORDER BY project.paid_amount asc,project.create_time desc
     </select>
     <select id="queryPackListAll" resultType="com.jero.project.entity.PayCommonProject">
         SELECT * FROM (

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java

@@ -8,49 +8,35 @@ import java.util.zip.ZipOutputStream;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
-import com.jero.company.entity.PayContactsManagement;
-import com.jero.company.service.IPayContactsManagementService;
-import com.jero.data.entity.PayFileDownloadRecord;
-import com.jero.data.service.IPayFileDownloadRecordService;
-import com.jero.meeting.entity.PayMeeting;
-import com.jero.meeting.service.IPayMeetingService;
-import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupDataFile;
 import com.jero.project.service.IPayWorkingGroupDataFileService;
+import com.jero.project.service.IPayWorkingGroupService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -69,6 +55,11 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 	private IPayWorkingGroupDataFileService payWorkingGroupDataFileService;
 	@Resource
 	private IOSSFileService iossFileService;
+
+	@Resource
+	private RolePermissionService rolePermissionService;
+	@Resource
+	private IPayWorkingGroupService payWorkingGroupService;
 	@Value("${jero.path.upload}")
 	private  String upLoadPath;
 	
@@ -95,6 +86,20 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
 			return Result.error("项目状态不正确！");
 		}
+
+		if(payWorkingGroupDataFile.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+			PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDataFile.getProjectId());
+			if(Objects.isNull(payWorkingGroup)){
+				throw new JeroBootException("工作组不存在！");
+			}
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			if(!rolePermissionService.getRolePermission("fileMaintenance:search")
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+				throw new JeroBootException("资料不可操作！");
+			}
+		}
+
 		if(!StringUtils.isBlank(payWorkingGroupDataFile.getFileName())){
 			payWorkingGroupDataFile.setFileName(oConvertUtils.replaceAllPercent(payWorkingGroupDataFile.getFileName()));
 		}
@@ -173,6 +178,23 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
+		PayWorkingGroupDataFile payWorkingGroupDataFile = payWorkingGroupDataFileService.getById(id);
+		if(Objects.isNull(payWorkingGroupDataFile)){
+			return Result.error("资料不存在!");
+		}
+
+		if(payWorkingGroupDataFile.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+			PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDataFile.getProjectId());
+			if(Objects.isNull(payWorkingGroup)){
+				throw new JeroBootException("工作组不存在！");
+			}
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			if(!rolePermissionService.getRolePermission("fileMaintenance:delete")
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+				throw new JeroBootException("资料不可操作！");
+			}
+		}
 		payWorkingGroupDataFileService.removeById(id);
 		return Result.OK("删除成功!");
 	}
@@ -191,10 +213,28 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			return Result.error("id不能为空!");
 		}
 		String[] s = ids.split(",");
+		StringBuilder msg = new StringBuilder();
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		for (String s1 : s) {
 			if(StringUtils.isBlank(s1)){
 				return Result.error("id不能为空!");
 			}
+			PayWorkingGroupDataFile payWorkingGroupDataFile = payWorkingGroupDataFileService.getById(s1);
+			if(Objects.isNull(payWorkingGroupDataFile)){
+				return Result.error("资料不存在!");
+			}else{
+				if(payWorkingGroupDataFile.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+					PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDataFile.getProjectId());
+					if(Objects.isNull(payWorkingGroup)){
+						throw new JeroBootException("工作组不存在！");
+					}
+					if(!rolePermissionService.getRolePermission("fileMaintenance:batchDel")
+							&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+							&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+						throw new JeroBootException("资料不可操作！");
+					}
+				}
+			}
 		}
 		this.payWorkingGroupDataFileService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -248,6 +288,18 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){
 			throw new JeroBootException("项目状态不正确！");
 		}
+		if(payWorkingGroupDataFile.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDataFile.getProjectId());
+			if(Objects.isNull(payWorkingGroup)){
+				throw new JeroBootException("工作组不存在！");
+			}
+			if(!rolePermissionService.getRolePermission("fileMaintenance:export")
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+					&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+				throw new JeroBootException("资料不可操作！");
+			}
+		}
 		// Step.1 组装查询条件
 		QueryWrapper<PayWorkingGroupDataFile> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDataFile, request.getParameterMap());
 

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java

@@ -156,7 +156,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 			 zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
 			 zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
 			 for (OSSFile ossFile : listOSSFile) {
-				 File file = new File(upLoadPath + "\\" + ossFile.getUrl());
+				 File file = new File(upLoadPath + File.separator + ossFile.getUrl());
 				 if(file.exists()){
 					 try {
 						 //添加ZipEntry，并ZipEntry中写入文件流w

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -15,6 +15,7 @@ import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
+import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
@@ -85,6 +86,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 private IPayMailBillProjectService payMailBillProjectService;
 	 @Resource
 	 private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
+	 @Resource
+	 private RolePermissionService rolePermissionService;
 
 	 /**
 	  * 分页列表查询
@@ -111,6 +114,16 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){
 			 payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName()));
 		 }
+		 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+		 if(Objects.isNull(payWorkingGroup)){
+			 return Result.error("工作组不存在！");
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(!rolePermissionService.getRolePermission("workingGroupMember:search")
+		 	&& !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+		 	&& !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+			 return Result.error("工作组成员不可操作！");
+		 }
 		 Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
 		 IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate);
 		 if(!CollectionUtils.isEmpty(pageList.getRecords())){
@@ -302,6 +315,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if (StringUtils.isBlank(payWorkingGroupSubItem.getProjectIds())) {
 			 return Result.error("id不能为空!");
 		 }
+
 		 String[] s = payWorkingGroupSubItem.getProjectIds().split(",");
 		 for (String s1 : s) {
 			 if (StringUtils.isBlank(s1)) {
@@ -316,12 +330,18 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(Objects.isNull(payWorkingGroup)){
 			 return Result.error("工作组不存在!");
 		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(!rolePermissionService.getRolePermission("workingGroupMember:setDunningReminder")
+				 && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+				 && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+			 throw new JeroBootException("工作组成员不可操作！");
+		 }
+
 		 List<String> listContacts = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList());
 		 List<PayContactsManagementTemporary> listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listContacts);
 		 if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){
 			 return Result.error("联系人不存在!");
 		 }
-		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 listPayWorkingGroupSubItem.forEach(p->{
 			 List<PayContactsManagementTemporary> listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList());
 			 if(CollectionUtils.isEmpty(listContactsInfo)){
@@ -469,6 +489,16 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 @GetMapping(value = "/exportXls")
 	 @ApiOperation(value = "工作组成员-导出excel", notes = "工作组成员-导出excel")
 	 public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubItem) {
+		 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+		 if(Objects.isNull(payWorkingGroup)){
+			 throw new JeroBootException("工作组不存在！");
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(!rolePermissionService.getRolePermission("workingGroupMember:export")
+				 && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+				 && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+			 throw new JeroBootException("工作组成员不可操作！");
+		 }
 		 return super.exportXls(request, payWorkingGroupSubItem, PayWorkingGroupSubItem.class, "工作组成员");
 	 }
 

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java

@@ -274,6 +274,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     private StringBuilder deleteProject(String id,String perms){
         StringBuilder sb = new StringBuilder();
         PayCommonProject payCommonProject = payCommonProjectService.getById(id);
+        if(Objects.isNull(payCommonProject)){
+            throw new JeroBootException("普通项目不存在！");
+        }
         // 项目负责人权限最底层，其他任何权限都可直接操作，不需要认证当前项目是否为项目负责人
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!rolePermissionService.getRolePermission(perms) && !Objects.equals(payCommonProject.getPrincipalId(), sysUser.getId())){

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
@@ -75,6 +76,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
     private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
     @Resource
     private PayWorkingGroupDistributionRecordMapper payWorkingGroupDistributionRecordMapper;
+    @Resource
+    private RolePermissionService rolePermissionService;
 
     @Override
     @Transactional
@@ -93,7 +96,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         }
         PayWorkingGroupDataFile payWorkingGroupDataFile =  payWorkingGroupDataFileService.getById(payWorkingGroupDistributionRecord.getDataId());
         if(Objects.isNull(payWorkingGroupDataFile)){
-            throw new JeroBootException("没有找到文件!");
+            throw new JeroBootException("资料不存在!");
         }
         OSSFile byId = iossFileService.getById(payWorkingGroupDataFile.getFileId());
         if(Objects.isNull(byId)){
@@ -108,6 +111,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         String msg = "";
         List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = new ArrayList<>();
         if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
+            if(Objects.isNull(payWorkingGroup)){
+                throw new JeroBootException("工作组不存在!");
+            }
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            if(!rolePermissionService.getRolePermission("fileMaintenance:distribute")
+                    && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+                    && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+                throw new JeroBootException("资料不可操作！");
+            }
             setRecord( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId);
             LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
             queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
@@ -115,10 +128,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             if(!CollectionUtils.isEmpty(listContacts)){
                 list = listContacts;
             }
-            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
-            if(Objects.isNull(payWorkingGroup)){
-                throw new JeroBootException("工作组不存在!");
-            }
             msg = payWorkingGroup.getWorkingGroupProject();
         }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
             LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
@@ -228,6 +237,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         List<PayContactsManagementTemporary> list = new ArrayList<>();
         List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = new ArrayList<>();
         if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
+            if(Objects.isNull(payWorkingGroup)){
+                throw new JeroBootException("工作组不存在!");
+            }
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            if(!rolePermissionService.getRolePermission("fileMaintenance:distribute")
+                    && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+                    && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+                throw new JeroBootException("资料不可操作！");
+            }
             listPayWorkingGroupDataFile.forEach(p->{
                 OSSFile byId = iossFileService.getById(p.getFileId());
                 if(Objects.isNull(byId)){
@@ -245,10 +264,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             if(!CollectionUtils.isEmpty(listContacts)){
                 list = listContacts;
             }
-            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
-            if(Objects.isNull(payWorkingGroup)){
-                throw new JeroBootException("工作组不存在!");
-            }
             msg = payWorkingGroup.getWorkingGroupProject();
         }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
             // 查询分标委成员

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -91,7 +91,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
 
         PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(id);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
+        if(!rolePermissionService.getRolePermission("workingGroupProject:delete") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
             throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
         }
 
@@ -115,8 +115,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         StringBuilder sb1 = new StringBuilder();
         ids.forEach(p->{
             PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(p);
+            if(Objects.isNull(payWorkingGroupOld)){
+                throw new JeroBootException("工作组不存在！");
+            }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
+            if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
                 sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！<br/>");
             }
             LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
@@ -158,7 +161,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
             throw new JeroBootException("工作组不存在！");
         }
         if(payWorkingGroupOld.getWorkingGroupProject().length() == 50){
-            throw new JeroBootException("工作组名称长度为50位，不可复制，请修改之后在复制！");
+            throw new JeroBootException("工作组名称长度为50位，不可复制，请修改之后再复制！");
         }
         String str = payWorkingGroupOld.getWorkingGroupProject() + "-副本";
         LambdaQueryWrapper<PayWorkingGroup> queryPayWorkingGroup = new LambdaQueryWrapper<>();

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.ProjectDetailService;
+import com.jero.common.service.RolePermissionService;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.vo.ProjectStatusVO;
@@ -35,6 +38,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -84,6 +88,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
     @Resource
     private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
+    @Resource
+    private RolePermissionService rolePermissionService;
+
 
     @Override
     public IPage<PayWorkingGroupSubItem> queryPageList(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubitem,String paymentDate) {
@@ -183,6 +190,16 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         if(Objects.isNull(payWorkingGroupSubItemOld)){
             throw new JeroBootException("项目不存在！");
         }
+        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+        if(Objects.isNull(payWorkingGroup)){
+            throw new JeroBootException("工作组不存在！");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(!rolePermissionService.getRolePermission("workingGroupMember:edit")
+                && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+                && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+            throw new JeroBootException("工作组成员不可操作！");
+        }
         // 项目为打包状态 || 到账！=0 || 开票！=0 || 邮寄！=0
         if(!Objects.equals(payWorkingGroupSubItem.getChargeCompanyId(),payWorkingGroupSubItemOld.getChargeCompanyId())
                 && (Objects.equals(payWorkingGroupSubItem.getPack(),PayProjectCommon.PACKAGING1)
@@ -207,10 +224,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 throw new JeroBootException("应收金额不能为空");
             }
         }
-        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+
-        if(Objects.isNull(payWorkingGroup)){
-            throw new JeroBootException("工作组不存在！");
-        }
         try {
             // 编辑保存前再次校验来款项目是否存在
             LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
@@ -597,7 +611,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         if (StringUtils.isBlank(id)) {
             throw new JeroBootException("id不能为空!");
         }
-        deleteProject(id);
+        deleteProject(id,"workingGroupMember:delete");
         payWorkingGroupSubItemService.removeById(id);
     }
 
@@ -612,7 +626,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             if (StringUtils.isBlank(s1)) {
                 throw new JeroBootException("id不能为空!");
             }
-            deleteProject(s1);
+            deleteProject(s1,"workingGroupMember:batchDel");
         }
         payWorkingGroupSubItemService.removeByIds(Arrays.asList(ids.split(",")));
     }
@@ -635,7 +649,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
      * @Return
      * @Exception
      */
-    private void deleteProject(String id){
+    private void deleteProject(String id,String perm){
         PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(id);
         // 到账！=0
         if(!Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0)){
@@ -649,6 +663,16 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         if(!Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0)){
             throw new JeroBootException("项目已有邮寄信息不可删除！");
         }
+        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+        if(Objects.isNull(payWorkingGroup)){
+            throw new JeroBootException("工作组不存在!");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(!rolePermissionService.getRolePermission(perm)
+                && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId())
+                && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){
+            throw new JeroBootException("工作组成员不可操作！");
+        }
         // 校验项目是否已关联合同 抛异常
         payIncomeContractService.getPayIncomeContractAssociated(Collections.singletonList(payWorkingGroupSubItem.getId()));
         // 如果已打报，同步删除打包关联

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -96,7 +96,7 @@ public class AllProjectStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
             Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
@@ -167,7 +167,7 @@ public class AllProjectStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
             Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
@@ -236,7 +236,8 @@ public class AllProjectStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+              return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
         }
                     if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
                         Calendar calendar = Calendar.getInstance();
@@ -275,7 +276,8 @@ public class AllProjectStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
         }
 
             if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
@@ -325,7 +327,8 @@ public class AllProjectStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<AllProjectStatistics> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "企业来款统计");
         }
             List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
             if (pageList != null) {

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java

@@ -84,7 +84,7 @@ public class CompanyComeMoneyStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
         Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
         IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
@@ -148,7 +148,7 @@ public class CompanyComeMoneyStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
         Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
         IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
@@ -210,7 +210,8 @@ public class CompanyComeMoneyStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
         }
             List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
 
@@ -244,7 +245,8 @@ public class CompanyComeMoneyStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
         }
             List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
             for (CompanyComeMoneyDetail s : pageList) {

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java

@@ -22,6 +22,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics;
 import com.jero.project.entity.PayWorkingGroupSubletSearch;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
+import com.jero.statistics.entity.CompanyComeMoneyDetail;
 import com.jero.util.AmountUtil;
 import com.jero.util.SearchUtil;
 import io.swagger.annotations.Api;
@@ -95,7 +96,7 @@ public class PayWorkingGroupStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
         IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
         List<PayWorkingGroupStatistics> records = pageList.getRecords();
@@ -161,7 +162,8 @@ public class PayWorkingGroupStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
         }
             List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
             //处理为空数据为0
@@ -198,7 +200,8 @@ public class PayWorkingGroupStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
         }
             List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
             //处理为空数据为0

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java

@@ -18,6 +18,7 @@ import com.jero.mail.entity.PayMailBillProject;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.project.entity.PayWorkGroupSubletStatistics;
+import com.jero.project.entity.PayWorkingGroupStatistics;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.statistics.entity.*;
 import com.jero.util.AmountUtil;
@@ -92,7 +93,7 @@ public class PrincipalPeopleStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            return Result.OK();
         }
 
             Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
@@ -205,7 +206,8 @@ public class PrincipalPeopleStatisticsController {
             String userId = sysUser.getId();
             idList.add(userId);
         } else {
-            throw new JeroBootException("权限异常");
+            ArrayList<PrincipalPeopleList> objects = new ArrayList<>();
+            return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款");
         }
             List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);
 

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java

@@ -404,7 +404,7 @@ public class SysDepartController {
 			//导入Excel格式校验，看匹配的字段文本概率
 			Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDepartExcel.class, params,1.0);
 			if(!t){
-				return Result.error("文件格式有误,请下载模板后上传 ！");
+				return Result.error("文件格式有误！");
 			}
             try {
             	// orgCode编码长度
@@ -421,30 +421,32 @@ public class SysDepartController {
 				List<String> errorMessage = new ArrayList<>();
                 int num = 0;
                 for (SysDepartExcel sysDepart : listSysDeparts) {
-                	String orgCode = sysDepart.getOrgCode();
+					int lineNumber = num +1;
-                	if(orgCode.length() > codeLength) {
+					List<String> errorList = ValidUtil.validateReturnList(sysDepart);
-                		String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
+					if (!errorList.isEmpty()){
-                		QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
+						errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
-                		queryWrapper.eq("org_code", parentCode);
+					}
-                		SysDepart parentDept = sysDepartService.getOne(queryWrapper);
+					if (errorMessage.isEmpty()){
-                		if(parentDept != null) {
+						String orgCode = sysDepart.getOrgCode();
-							sysDepart.setParentId(parentDept.getId());
+						if(orgCode.length() > codeLength) {
-						} else {
+							String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
+							QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
+							queryWrapper.eq("org_code", parentCode);
+							SysDepart parentDept = sysDepartService.getOne(queryWrapper);
+							if(parentDept != null) {
+								sysDepart.setParentId(parentDept.getId());
+							} else {
+								sysDepart.setParentId("");
+							}
+						}else{
 							sysDepart.setParentId("");
 						}
-                	}else{
+						//update-begin---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
-                		sysDepart.setParentId("");
+						sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
+						//update-end---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
+						sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 					}
-					//update-begin---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
-					sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
-					//update-end---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
-					sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
-					int lineNumber = num +1;
 					try {
-						List<String> errorList = ValidUtil.validateReturnList(sysDepart);
-						if (!errorList.isEmpty()){
-							errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
-						}
 						LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
 						wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName());
 						if (sysDepartService.count(wrapper) > 0) {
@@ -453,7 +455,7 @@ public class SysDepartController {
 						LambdaQueryWrapper<SysDepart> wrapper1 = new LambdaQueryWrapper<>();
 						wrapper1.eq(SysDepart::getOrgCode,sysDepart.getOrgCode());
 						if (sysDepartService.count(wrapper1) > 0) {
-							errorMessage.add("第 " + lineNumber + " 行：部门编码已经存在");
+							errorMessage.add("第 " + lineNumber + " 行：机构编码已经存在");
 						}
 						if (errorMessage.isEmpty()){
 							SysDepart sysDepart1 = new SysDepart();
@@ -467,11 +469,13 @@ public class SysDepartController {
 					}
 					num++;
                 }
-				//清空部门缓存
+				if (errorMessage.isEmpty()){
-				Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
+					//清空部门缓存
-				Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
+					Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
-				redisTemplate.delete(keys3);
+					Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
-				redisTemplate.delete(keys4);
+					redisTemplate.delete(keys3);
+					redisTemplate.delete(keys4);
+				}
 				return ImportExcelUtil.importReturnRes(errorMessage.size(), errorMessage);
             } catch (Exception e) {
                 log.error(e.getMessage(),e);

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -773,7 +773,7 @@ public class SysUserController {
                         List<String> errorList = ValidUtil.validateReturnList(sysUser);
                         if (!errorList.isEmpty()){
                             errorLines++;
-                            errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
+                            errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
                         }
                         //处理邮箱和手机号的加密
                         UserUtil.encryptUser(sysUser);

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java

@@ -16,10 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
-	@Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))")
+	@Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))")
 	List<String> getRoleByUserName(@Param("username") String username);
 
-	@Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))")
+	@Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))")
 	List<String> getRoleIdByUserName(@Param("username") String username);
 
 }

jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java

@@ -34,10 +34,11 @@ public class SysDepartExcel {
 
     /**机构编码*/
     @Excel(name="机构编码",width=15,orderNum = "2")
+    @NotBlank(message = "机构编码不能为空")
     private String orgCode;
     /**手机号*/
     @Excel(name="手机号",width=15,orderNum = "5")
-    @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
+    @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
     private String mobile;
     /**传真*/
     private String fax;

pom.xml

@@ -42,7 +42,7 @@
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version>
-		<tomcat.version>9.0.48</tomcat.version>
+		<tomcat.version>9.0.54</tomcat.version>
 	</properties>
 
 	<modules>