项目人员导入修改

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -117,13 +117,15 @@ public class SysUserController extends BaseController {
      *
      * @param file      导入文件
      * @param projectId 项目id
+     * @param roleId    角色id
      */
     @Log(title = "项目用户管理", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:projectUser:import")
     @PostMapping(value = "/importProjectData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importProjectData(@RequestPart("file") MultipartFile file,
-                                     @RequestParam(value = "projectId") Long projectId) throws Exception {
-        ExcelResult<SysProjectUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysProjectUserImportVo.class, new SysProjectUserImportListener(projectId));
+                                     @RequestParam(value = "projectId") Long projectId,
+                                     @RequestParam(value = "roleId") Long roleId) throws Exception {
+        ExcelResult<SysProjectUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysProjectUserImportVo.class, new SysProjectUserImportListener(projectId, roleId));
         return R.ok(result.getAnalysis());
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysProjectUserImportVo.java

@@ -39,16 +39,4 @@ public class SysProjectUserImportVo implements Serializable {
     @ExcelProperty(value = "密码")
     private String password;
 
-    /**
-     * 项目名称
-     */
-    @ExcelProperty(value = "项目名称")
-    private String projectName;
-
-    /**
-     * 角色名称
-     */
-    @ExcelProperty("角色")
-    private String roleName;
-
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysProjectUserImportListener.java

@@ -2,7 +2,6 @@ package org.dromara.system.listener;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.BCrypt;
 import cn.hutool.http.HtmlUtil;
 import com.alibaba.excel.context.AnalysisContext;
@@ -22,7 +21,6 @@ import org.dromara.system.controller.system.SysUserController;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.SysProjectUserImportVo;
 import org.dromara.system.domain.vo.SysUserVo;
-import org.dromara.system.service.ISysRoleService;
 import org.dromara.system.service.ISysUserService;
 
 import java.util.List;
@@ -40,8 +38,8 @@ public class SysProjectUserImportListener extends AnalysisEventListener<SysProje
 
     private final ISysUserService userService;
     private final SysUserController sysUserController;
-    private final ISysRoleService sysRoleService;
     private final Long operUserId;
+    private final Long roleId;
     private final String userType;
     private final String operTenantId;
 
@@ -50,13 +48,13 @@ public class SysProjectUserImportListener extends AnalysisEventListener<SysProje
     private final StringBuilder successMsg = new StringBuilder();
     private final StringBuilder failureMsg = new StringBuilder();
 
-    public SysProjectUserImportListener( Long projectId) {
+    public SysProjectUserImportListener(Long projectId, Long roleId) {
         this.userService = SpringUtils.getBean(ISysUserService.class);
         this.sysUserController = SpringUtils.getBean(SysUserController.class);
-        this.sysRoleService = SpringUtils.getBean(ISysRoleService.class);
         this.operUserId = LoginHelper.getUserId();
         this.operTenantId = LoginHelper.getTenantId();
         this.userType = PROJECT_USER_TYPE + PROJECT_USER_TYPE_SPLIT + projectId;
+        this.roleId = roleId;
     }
 
     @Override
@@ -75,9 +73,8 @@ public class SysProjectUserImportListener extends AnalysisEventListener<SysProje
                 }
                 user.setPassword(BCrypt.hashpw(password));
                 user.setCreateBy(operUserId);
-                //设置角色
-                if (StringUtils.isNotEmpty(userVo.getRoleName())) {
-                    user.setRoleIds(sysRoleService.selectRoleIdsByNameList(StrUtil.split(userVo.getRoleName(), "/")).toArray(Long[]::new));
+                if (roleId != null) {
+                    user.setRoleIds(new Long[]{roleId});
                 }
                 sysUserController.add(user);
                 successNum++;