From de6c43cfe69117f0553f9f040f48225b56f431a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 22 Sep 2021 15:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E9=9C=80=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E3=80=81=E8=81=94=E7=B3=BB=E4=BA=BA=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 2 +- .../common/PayCompanyManagementCommon.java | 2 +- .../PayContactsManagementController.java | 69 +++++++------------ .../PayWorkingGroupSubItemController.java | 15 ++-- 4 files changed, 36 insertions(+), 52 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 1b6ab5f2..6e1d6ec2 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -149,7 +149,7 @@ public class ShiroConfig { // 会议添加企业，联系人接口放过 filterChainDefinitionMap.put("/company/payCompanyManagement/listMeeting","anon"); filterChainDefinitionMap.put("/company/payCompanyManagement/addMeeting","anon"); - filterChainDefinitionMap.put("/company/payContactsManagement/listMeeting","anon"); + filterChainDefinitionMap.put("/company/payContactsManagement/queryByCompanyMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/addMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/queryByIdMeeting","anon"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java index 9d085b26..96f57de1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java @@ -20,5 +20,5 @@ public class PayCompanyManagementCommon { /** * 财务角色 */ - public final static String ROLE_CODE = ""; + public final static String ROLE_CODE = "cwry"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 02aa8e4c..28aaad78 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -107,50 +107,6 @@ public class PayContactsManagementController extends JeroController queryPageListMeeting(PayContactsManagement payContactsManagement, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 20){ - return Result.error("姓名长度不能大于20个字符！"); - } - if(!StringUtils.isBlank(payContactsManagement.getCompanyName()) && payContactsManagement.getCompanyName().length() > 50){ - return Result.error("企业名称长度不能大于50个字符！"); - } - if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){ - return Result.error("手机号长度不能大于11个字符！"); - } - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payContactsManagementService.queryPageList(page, payContactsManagement); - List listPayContactsManagement = pageList.getRecords(); - if(!CollectionUtils.isEmpty(listPayContactsManagement)){ - try { - listPayContactsManagement.forEach(p->{ - if (!StringUtils.isBlank(p.getPhone())){ - p.setPhone(PasswordUtil.decrypt(p.getPhone())); - } - if (!StringUtils.isBlank(p.getEmail())){ - p.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - }); - pageList.setRecords(listPayContactsManagement); - }catch (Exception e){ - log.error("手机号、邮箱解密异常！",e); - } - } - return Result.OK(pageList); - } - /** * 添加-会议对外开放接口 * @@ -482,6 +438,31 @@ public class PayContactsManagementController extends JeroController queryByCompanyMeeting(@RequestParam(name="companyId") String companyId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getCompanyId,companyId); + List list = payContactsManagementService.list(queryWrapper); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + if(!StringUtils.isBlank(p.getPhone())){ + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + if(!StringUtils.isBlank(p.getEmail())){ + p.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + }); + } + return Result.OK(list); + } + /** * 通过企业id查询用户 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index edea709a..c6e4b40d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -4,6 +4,7 @@ import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.dto.message.BusMessageDTO; import com.jero.common.api.dto.message.MessageDTO; import com.jero.common.api.vo.Result; import com.jero.common.service.ProjectDetailService; @@ -159,12 +160,14 @@ public class PayWorkingGroupSubItemController extends JeroController