fixbug：用户导入

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.makeit.service.platform.auth.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,7 +44,6 @@ import com.makeit.module.admin.vo.plat.PlatButtonVO;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
 import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
 import com.makeit.module.admin.vo.plat.PlatUserRoleMenuRedisVO;
 import com.makeit.module.admin.vo.plat.PlatUserRoleMenuRedisVO;
-import com.makeit.module.system.service.SysDictionaryCategoryService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatRoleMenuService;
 import com.makeit.service.platform.auth.PlatRoleMenuService;
 import com.makeit.service.platform.auth.PlatRoleOrgService;
 import com.makeit.service.platform.auth.PlatRoleOrgService;
@@ -123,8 +123,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
     @Autowired
     @Autowired
     private PlatOrgService platOrgService;
     private PlatOrgService platOrgService;
 
 
-    @Autowired
-    private SysDictionaryCategoryService sysDictionaryCategoryService;
+    private DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
 
 
     private static final Logger logger = LoggerFactory.getLogger(PlatUserServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(PlatUserServiceImpl.class);
 
 
@@ -1074,6 +1073,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
      * @param excelFile
      * @param excelFile
      */
      */
     @Override
     @Override
+    @Transactional
     public ExcelImportVo importExcel(MultipartFile excelFile) throws Exception {
     public ExcelImportVo importExcel(MultipartFile excelFile) throws Exception {
         List<PlatUserImportDTO> platUserImportDTOS = ExcelUtil.importExcel(null, 3, excelFile, PlatUserImportDTO.class);
         List<PlatUserImportDTO> platUserImportDTOS = ExcelUtil.importExcel(null, 3, excelFile, PlatUserImportDTO.class);
 
 
@@ -1109,6 +1109,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
             }
             }
             if (errorVoList.isEmpty()) {
             if (errorVoList.isEmpty()) {
                 List<PlatUser> platUsers = new ArrayList<>();
                 List<PlatUser> platUsers = new ArrayList<>();
+                List<PlatUserRole> platUserRoles = new ArrayList<>();
                 platUserImportDTOS.forEach(vo -> {
                 platUserImportDTOS.forEach(vo -> {
                     PlatUser platUser = BeanDtoVoUtils.convert(vo, PlatUser.class);
                     PlatUser platUser = BeanDtoVoUtils.convert(vo, PlatUser.class);
                     vo.setPassword(PasswordUtils.encryptPassword(vo.getPassword()));
                     vo.setPassword(PasswordUtils.encryptPassword(vo.getPassword()));
@@ -1119,10 +1120,17 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                     PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(vo.getOrgName())).orElse(new PlatOrg());
                     PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(vo.getOrgName())).orElse(new PlatOrg());
                     platUser.setOrgId(platOrg.getId());
                     platUser.setOrgId(platOrg.getId());
                     platUser.setOrgPath(platOrg.getPath() + "," + platOrg.getId());
                     platUser.setOrgPath(platOrg.getPath() + "," + platOrg.getId());
+                    platUser.setId(String.valueOf(defaultIdentifierGenerator.nextId(platUser)));
                     platUsers.add(platUser);
                     platUsers.add(platUser);
+                    PlatUserRole platUserRole = new PlatUserRole();
+                    platUserRole.setUserId(platUser.getId());
+                    String roleId = roleNameMap.get(vo.getRoleName());
+                    platUserRole.setRoleId(roleId);
+                    platUserRoles.add(platUserRole);
                 });
                 });
-
                 saveBatch(platUsers);
                 saveBatch(platUsers);
+                platUserRoleService.saveBatch(platUserRoles);
+
             }
             }
             return errorVoList;
             return errorVoList;
         });
         });