fix:企业端分标委
This commit is contained in:
+27
-3
@@ -155,9 +155,33 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
|
||||
if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 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<PayCompanyManagement> page = new Page<PayCompanyManagement>(pageNo, pageSize);
|
||||
QueryWrapper<PayCompanyManagement> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.like(StringUtils.isNotEmpty(payCompanyManagement.getCompanyName()),"company_name",payCompanyManagement.getCompanyName());
|
||||
ArrayList<Integer> objects = new ArrayList<>();
|
||||
objects.add(1);//副理事会
|
||||
objects.add(2);//理事会
|
||||
queryWrapper1.in("member_nature",objects);
|
||||
IPage<PayCompanyManagement> pageList = payCompanyManagementService.page(page, queryWrapper1);
|
||||
List<PayCompanyManagement> 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<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());
|
||||
Page<PayCompanyManagement> page = new Page<PayCompanyManagement>(pageNo, pageSize);
|
||||
|
||||
Reference in New Issue
Block a user