fix: 工作组批量添加接口Id重复问题
This commit is contained in:
+7
-3
@@ -52,6 +52,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
@@ -428,6 +429,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
|||||||
@RequiresPermissions("workingGroupMember:batchAdd")
|
@RequiresPermissions("workingGroupMember:batchAdd")
|
||||||
@ApiOperation(value = "工作组成员-批量添加", notes = "工作组成员-批量添加")
|
@ApiOperation(value = "工作组成员-批量添加", notes = "工作组成员-批量添加")
|
||||||
@PostMapping(value = "/batchAdd")
|
@PostMapping(value = "/batchAdd")
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Result<?> batchAdd(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
|
public Result<?> batchAdd(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
|
||||||
String workingGroupIds = payWorkingGroupSubItem.getWorkingGroupIds();
|
String workingGroupIds = payWorkingGroupSubItem.getWorkingGroupIds();
|
||||||
if (StringUtils.isBlank(workingGroupIds)) {
|
if (StringUtils.isBlank(workingGroupIds)) {
|
||||||
@@ -435,10 +437,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
|||||||
}
|
}
|
||||||
String[] workingGroupIdsArr = workingGroupIds.split(",");
|
String[] workingGroupIdsArr = workingGroupIds.split(",");
|
||||||
for (String workingGroupId : workingGroupIdsArr) {
|
for (String workingGroupId : workingGroupIdsArr) {
|
||||||
if (StringUtils.isBlank(workingGroupId)) {
|
payWorkingGroupSubItem.setId(null);
|
||||||
return Result.error("工作组id不能为空!");
|
List<PayWorkingGroupSubItemContacts> payWorkingGroupSubItemContactsList =
|
||||||
}
|
payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList();
|
||||||
|
payWorkingGroupSubItemContactsList.forEach(p-> p.setId(null));
|
||||||
payWorkingGroupSubItem.setWorkingGroupId(workingGroupId);
|
payWorkingGroupSubItem.setWorkingGroupId(workingGroupId);
|
||||||
|
payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem);
|
||||||
StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
|
StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
|
||||||
if (!StringUtils.isBlank(msg)) {
|
if (!StringUtils.isBlank(msg)) {
|
||||||
return Result.error(msg.toString());
|
return Result.error(msg.toString());
|
||||||
|
|||||||
Reference in New Issue
Block a user