diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 22da9466..b202d305 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -155,9 +155,33 @@ public class PayCompanyManagementController extends JeroController 50){ return Result.error("企业名称长度不能大于50个字符!"); } - //此处只做约束理事会添加成员(MemberNature) - if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())&& !"1".equals(payCompanyManagement.getMemberNature())){ - return Result.error("理事会标识错误"); + //理事会添加成员路线 + if("2".equals(payCompanyManagement.getMemberNature())){ + Page page = new Page(pageNo, pageSize); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.like(StringUtils.isNotEmpty(payCompanyManagement.getCompanyName()),"company_name",payCompanyManagement.getCompanyName()); + ArrayList objects = new ArrayList<>(); + objects.add(1);//副理事会 + objects.add(2);//理事会 + queryWrapper1.in("member_nature",objects); + IPage pageList = payCompanyManagementService.page(page, queryWrapper1); + List listPayCompanyManagement = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ + try { + listPayCompanyManagement.forEach(p->{ + if (!StringUtils.isBlank(p.getCompanyPhone())){ + p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); + } + if(!Objects.equals(p.getStatus(),PayCompanyManagementCommon.STATUS1)){ + p.setCompanyName(p.getCompanyName() + PayCompanyManagementCommon.COMPANY_STATUS); + } + }); + pageList.setRecords(listPayCompanyManagement); + }catch (Exception e){ + log.error("公司电话解密异常!",e); + } + } + return Result.OK(pageList); } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); Page page = new Page(pageNo, pageSize);