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 2e0f6861..a6bd2429 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 @@ -15,6 +15,7 @@ import com.jero.common.common.RoleCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ProjectDetailService; import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; @@ -76,6 +77,8 @@ public class PayCompanyManagementController extends JeroController queryCompanyToProjectById(@RequestParam(name="ids") String ids) { + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if(StringUtils.isBlank(s1)){ + return Result.error("id不能为空!"); + } + } + LambdaQueryWrapper queryPayCompanyManagement = new LambdaQueryWrapper<>(); + queryPayCompanyManagement.in(PayCompanyManagement::getId,Arrays.asList(s)); + List listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement); + if(CollectionUtils.isEmpty(listPayCompanyManagement)){ + return Result.error("企业不存在!"); + } + listPayCompanyManagement.forEach(p->{ + + }); + return Result.OK(""); + } /** * 通过id查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 7107b0b3..8e1c1702 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -244,6 +244,14 @@ public class PayWorkingGroupController extends JeroController{ PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(p); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR) && !Objects.equals(payWorkingGroupOld.getPrincipalA(),sysUser.getId())){ + if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR) && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作!
"); } LambdaQueryWrapper query = new LambdaQueryWrapper<>();