From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
index a0c9913..b3cdb50 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
@@ -4,11 +4,16 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
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.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleImportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
@@ -33,6 +38,7 @@
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.system.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.system.enums.LogRecordConstants.*;
@@ -267,6 +273,55 @@
});
}
+ @Override
+ public RoleImportRespVO importRoleList(List<RoleImportExcelVO> importRoles, RoleImportReqVO importReqVO) {
+ importRoles = filterList(importRoles, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importRoles)) {
+ throw exception(ROLE_IMPORT_LIST_IS_EMPTY);
+ }
+ RoleImportRespVO respVO = RoleImportRespVO.builder()
+ .createRoleNames(new ArrayList<>())
+ .updateRoleNames(new ArrayList<>())
+ .failureRoleNames(new LinkedHashMap<>())
+ .build();
+ importRoles.forEach(importRole -> {
+ try {
+ // 1. 鍒ゆ柇鏄惁瀛樺湪锛堟寜鍚嶇О鎴栨爣璇嗭級
+ RoleDO existRole = roleMapper.selectByName(importRole.getName());
+ if (existRole == null && StrUtil.isNotBlank(importRole.getCode())) {
+ existRole = roleMapper.selectByCode(importRole.getCode());
+ }
+ if (existRole == null) {
+ // 2.1 鏂板
+ validateRoleDuplicate(importRole.getName(), importRole.getCode(), null);
+ RoleDO role = BeanUtils.toBean(importRole, RoleDO.class)
+ .setType(RoleTypeEnum.CUSTOM.getType())
+ .setStatus(ObjUtil.defaultIfNull(importRole.getStatus(), CommonStatusEnum.ENABLE.getStatus()))
+ .setDataScope(DataScopeEnum.ALL.getScope());
+ if (role.getSort() == null) {
+ role.setSort(0);
+ }
+ roleMapper.insert(role);
+ respVO.getCreateRoleNames().add(importRole.getName());
+ return;
+ }
+ // 2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureRoleNames().put(importRole.getName(),
+ StrUtil.format(ROLE_NAME_DUPLICATE.getMsg(), importRole.getName()));
+ return;
+ }
+ RoleDO updateRole = BeanUtils.toBean(importRole, RoleDO.class)
+ .setId(existRole.getId());
+ roleMapper.updateById(updateRole);
+ respVO.getUpdateRoleNames().add(importRole.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureRoleNames().put(importRole.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
/**
* 鑾峰緱鑷韩鐨勪唬鐞嗗璞★紝瑙ｅ喅 AOP 鐢熸晥闂
*
--
Gitblit v1.9.3