修改bug#41297

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<PayCompanyMan
 	private SendMessageService sendMessageService;
 	@Resource
 	private IPayContactsManagementService payContactsManagementService;
+	@Resource
+	private ProjectDetailService projectDetailService;
 
 	/**
 	 * 企业管理-分页列表查询
@@ -541,6 +544,35 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		}
 		return Result.OK(list);
 	}
+	/**
+	 * 通过id查询企业是否关联了项目
+	 *
+	 * @param ids 企业管理ids
+	 * @return
+	 */
+	@ApiOperation(value="企业管理-通过id查询企业是否关联了项目", notes="企业管理-通过id查询企业是否关联了项目")
+	@GetMapping(value = "/queryCompanyToProjectById")
+	public Result<?> 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<PayCompanyManagement> queryPayCompanyManagement = new LambdaQueryWrapper<>();
+		queryPayCompanyManagement.in(PayCompanyManagement::getId,Arrays.asList(s));
+		List<PayCompanyManagement> listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement);
+		if(CollectionUtils.isEmpty(listPayCompanyManagement)){
+			return Result.error("企业不存在！");
+		}
+		listPayCompanyManagement.forEach(p->{
+
+		});
+		return Result.OK("");
+	}
 
 	/**
 	 * 通过id查询

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java

@@ -244,6 +244,14 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		if(StringUtils.isBlank(payWorkingGroup.getId())){
 			return Result.error("工作组id不能为空！");
 		}
+		 PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(payWorkingGroup.getId());
+		 if(Objects.isNull(payWorkingGroupOld)){
+			 return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！");
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR) && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
+			 return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
+		 }
 		 payWorkingGroupService.copy(payWorkingGroup);
 		 return Result.OK("复制成功！");
 	 }
@@ -304,7 +312,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！");
 		}
 		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())){
 			return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
 		}
 		try {

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -80,7 +80,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
 
         PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(id);
         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())){
             throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
         }
 
@@ -105,7 +105,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         ids.forEach(p->{
             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() + "工作组项目不可操作！<br/>");
             }
             LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();