From 07c26d6021d839525f05304cc7f3a34658ca9320 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Apr 2022 17:57:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/company/controller/CompanyLoginController.java   | 2 +-
 .../com/jero/company/entity/PayCompanyManagement.java     | 1 -
 .../jero/meeting/service/impl/PayMeetingServiceImpl.java  | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
index d9c678e7..9679ad4c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
@@ -249,7 +249,7 @@ public class CompanyLoginController {
         //update-begin--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
         LoginUser loginUser = new LoginUser();
         BeanUtils.copyProperties(contactsManagement, loginUser);
-        baseCommonService.addLog("手机号: " + contactsManagement.getPhone() + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
+        baseCommonService.addLog("用户: " + contactsManagement.getPhone() + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
         //update-end--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
         return result;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
index 35a38243..798f9515 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
@@ -87,7 +87,6 @@ public class PayCompanyManagement implements Serializable {
     @ApiModelProperty(value = "银行账号")
     @NotEmpty(message = "银行账号不能为空")
     @Size(max = 50, message = "银行账号长度不能大于50个字符")
-    @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
     private String bankAccount;
     /**企业角色1:普通企业、2：会员企业*/
     @ApiModelProperty(value = "企业角色")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index c751db48..95dcf4d3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -774,9 +774,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             }
         }
         //会议分类：1可报名/2已报名/3全部
-        Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
+        String meetingSignUpType = request.getParameter("meetingSignUpType");
         //可报名或者报名状态选择可报名  1可报名/2已报名/0全部/4 app全部(可报名和进行中)
-        if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
+        if (Objects.equals(meetingSignUpType, "1")||Objects.equals(signUpStatus,8)) {
             //queryWrapper.ne("pms.company_contact_id",contactId);
             queryWrapper.ge("register_deadline", now);
             queryWrapper.ge("end_time", now);
@@ -788,10 +788,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             queryWrapper.groupBy("meeting_name");
             queryWrapper.having("company_contact_ids not like concat('%',{0},'%') or company_contact_ids is null",contactId);
             return baseMapper.pageListContract(page, queryWrapper, now);
-        } else if (Objects.equals(meetingSignUpType, 2 )) {
+        } else if (Objects.equals(meetingSignUpType, "2" )) {
             queryWrapper.eq("pms.company_contact_id", contactId);
             return baseMapper.pageListContract2(page, queryWrapper, now);
-        } else if (Objects.equals(meetingSignUpType, 0)){
+        } else if (Objects.equals(meetingSignUpType, "0")){
             return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
         }else {
             queryWrapper.ge("end_time", now);