|
@@ -1,5 +1,6 @@
|
|
|
package cn.ezhizao.project.business.product.controller;
|
|
|
|
|
|
+import cn.ezhizao.common.exception.ServiceException;
|
|
|
import cn.ezhizao.common.utils.SecurityUtils;
|
|
|
import cn.ezhizao.common.utils.poi.ExcelUtil;
|
|
|
import cn.ezhizao.framework.aspectj.lang.annotation.Log;
|
|
@@ -32,6 +33,7 @@ import cn.ezhizao.project.system.service.ISysDeptUserService;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.server.ServerErrorException;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -954,6 +956,10 @@ public class BizDayworkItemController extends BaseController {
|
|
|
for (BizProductionResourceGroupDetail inviteItem : inviteList) {
|
|
|
inviteGroups.add(inviteItem.getProductionResourceGroupId());
|
|
|
}
|
|
|
+ // 20240712 防止重复邀请判断
|
|
|
+ if (inviteList.stream().anyMatch(e -> e.getProtemDayworkId().equals(item.getProtemDayworkId()) && e.getProtemProcessId().equals(item.getProtemProcessId()) && e.getProtemProcessStepNumber().equals(item.getProtemProcessStepNumber()))) {
|
|
|
+ throw new ServiceException("请勿重复邀请相同员工。");
|
|
|
+ }
|
|
|
//存放当前用户和被邀请人员资源组的差集
|
|
|
List<Long> filterGroupIds = new ArrayList<>();
|
|
|
for (Long group : groups) {
|