From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
index 5d67aea..66ac4a4 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
@@ -1,23 +1,40 @@
package cn.iocoder.yudao.module.bpm.service.definition;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupImportExcelVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupImportReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupImportRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupSaveReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_IMPORT_EXISTS;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_IMPORT_LIST_IS_EMPTY;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_IMPORT_USER_NOT_EXISTS;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_IS_DISABLE;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS;
@@ -32,6 +49,8 @@
@Resource
private BpmUserGroupMapper userGroupMapper;
+ @Resource
+ private AdminUserApi adminUserApi;
@Override
public Long createUserGroup(BpmUserGroupSaveReqVO createReqVO) {
@@ -104,4 +123,79 @@
});
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BpmUserGroupImportRespVO importUserGroupList(List<BpmUserGroupImportExcelVO> importUserGroups,
+ BpmUserGroupImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importUserGroups = filterList(importUserGroups, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importUserGroups)) {
+ throw exception(USER_GROUP_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ BpmUserGroupImportRespVO respVO = BpmUserGroupImportRespVO.builder()
+ .createUserGroupNames(new ArrayList<>())
+ .updateUserGroupNames(new ArrayList<>())
+ .failureUserGroupNames(new LinkedHashMap<>())
+ .build();
+ importUserGroups.forEach(importUserGroup -> {
+ try {
+ // 2.1 瑙ｆ瀽鎴愬憳
+ Set<Long> userIds = parseUserIds(importUserGroup.getUserNames());
+ // 2.2 鎸夊悕瀛楀尮閰嶅凡瀛樺湪璁板綍
+ BpmUserGroupDO existUserGroup = userGroupMapper.selectOne(
+ BpmUserGroupDO::getName, importUserGroup.getName());
+ if (existUserGroup == null) {
+ BpmUserGroupDO userGroup = BeanUtils.toBean(importUserGroup, BpmUserGroupDO.class);
+ userGroup.setUserIds(userIds);
+ userGroupMapper.insert(userGroup);
+ respVO.getCreateUserGroupNames().add(importUserGroup.getName());
+ return;
+ }
+ // 2.3 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureUserGroupNames().put(importUserGroup.getName(),
+ StrUtil.format(USER_GROUP_IMPORT_EXISTS.getMsg(), importUserGroup.getName()));
+ return;
+ }
+ BpmUserGroupDO updateUserGroup = BeanUtils.toBean(importUserGroup, BpmUserGroupDO.class)
+ .setId(existUserGroup.getId());
+ updateUserGroup.setUserIds(userIds);
+ userGroupMapper.updateById(updateUserGroup);
+ respVO.getUpdateUserGroupNames().add(importUserGroup.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureUserGroupNames().put(importUserGroup.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ /**
+ * 瑙ｆ瀽鎴愬憳濮撳悕锛岃浆鎹负鐢ㄦ埛缂栧彿鏁扮粍
+ *
+ * @param userNames 鎴愬憳濮撳悕锛屽涓互鑻辨枃閫楀彿銆佷腑鏂囬�楀彿鎴栭】鍙峰垎闅�
+ * @return 鐢ㄦ埛缂栧彿鏁扮粍
+ */
+ private Set<Long> parseUserIds(String userNames) {
+ Set<Long> userIds = new LinkedHashSet<>();
+ if (StrUtil.isBlank(userNames)) {
+ return userIds;
+ }
+ for (String name : userNames.split("[,锛屻�乚")) {
+ String trimmedName = name.trim();
+ if (StrUtil.isBlank(trimmedName)) {
+ continue;
+ }
+ List<AdminUserRespDTO> users = adminUserApi.getUserListByNickname(trimmedName);
+ AdminUserRespDTO match = users.stream()
+ .filter(user -> Objects.equals(user.getNickname(), trimmedName))
+ .findFirst().orElse(null);
+ if (match == null) {
+ throw exception(USER_GROUP_IMPORT_USER_NOT_EXISTS, trimmedName);
+ }
+ userIds.add(match.getId());
+ }
+ return userIds;
+ }
+
}
--
Gitblit v1.9.3