feat: 用户、组织机构导入功能开发；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -141,11 +141,10 @@ public class SysDeptController extends BaseController
     /**
      * 导入部门数据
      */
-    @RequiresPermissions("system:dept:import")
+    @RequiresPermissions("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<DeptImportDTO> util = new ExcelUtil<DeptImportDTO>(DeptImportDTO.class);
         List<DeptImportDTO> deptList = util.importExcel(file.getInputStream());
         String message = deptService.importDept(deptList);
@@ -155,10 +154,9 @@ public class SysDeptController extends BaseController
     /**
      * 下载部门导入模板
      */
-    @RequiresPermissions("system:dept:import")
+    @RequiresPermissions("system:dept:add")
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) throws IOException
-    {
+    public void importTemplate(HttpServletResponse response) throws IOException {
         ExcelUtil<DeptImportDTO> util = new ExcelUtil<DeptImportDTO>(DeptImportDTO.class);
         util.importTemplateExcel(response, "部门数据");
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -101,11 +101,14 @@ public class SysUserController extends BaseController
         util.exportExcel(response, list, "用户数据");
     }
 
+
+    /**
+     * 导入用户数据
+     */
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @RequiresPermissions("system:user:import")
+    @RequiresPermissions("system:user:add")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<UserImportDTO> util = new ExcelUtil<UserImportDTO>(UserImportDTO.class);
         List<UserImportDTO> userImportList = util.importExcel(file.getInputStream());
         String operName = SecurityUtils.getUsername();
@@ -113,9 +116,13 @@ public class SysUserController extends BaseController
         return success(message);
     }
 
+
+    /**
+     * 下载用户导入模板
+     */
+    @RequiresPermissions("system:user:add")
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) throws IOException
-    {
+    public void importTemplate(HttpServletResponse response) throws IOException {
         ExcelUtil<UserImportDTO> util = new ExcelUtil<UserImportDTO>(UserImportDTO.class);
         util.importTemplateExcel(response, "用户数据");
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/domain/dto/DeptImportDTO.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain.dto;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.common.core.annotation.Excel;
 import lombok.Data;
@@ -36,6 +37,10 @@ public class DeptImportDTO {
     @Excel(name = "负责人姓名")
     private String leader;
 
+    /** 费率 */
+    @Excel(name = "费率")
+    private String rateValue;
+
     /** 发票抬头 */
     @Excel(name = "发票抬头")
     private String invoiceName;

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -414,6 +414,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         dept.setBankAccount(importDTO.getBankAccount());
         dept.setCreateBy(SecurityUtils.getUsername());
         dept.setCreateTime(DateUtils.getNowDate());
+        dept.setRateValue(importDTO.getRateValue());
         return dept;
     }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -638,24 +638,19 @@ public class SysUserServiceImpl implements ISysUserService
                 if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
                     deptService.checkDeptDataScope(user.getDeptId());
-                    String password = configService.selectConfigByKey("sys.user.initPassword");
-                    user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
-                    userMapper.insertUser(user);
 
                     // 处理角色关联
                     if (StringUtils.isNotEmpty(importDTO.getRoleName())) {
                         SysRole roleId = roleMapper.checkRoleNameUnique(importDTO.getRoleName());
                         if (StringUtils.isNotNull(roleId)) {
-                            SysUserRole userRole = new SysUserRole();
-                            userRole.setUserId(user.getUserId());
-                            userRole.setRoleId(roleId.getRoleId());
-                            List<SysUserRole> userRoleList = new ArrayList<>();
-                            userRoleList.add(userRole);
-                            userRoleMapper.batchUserRole(userRoleList);
+                            user.setRoleIds(new Long[]{roleId.getRoleId()});
                         }
                     }
 
+                    this.insertUser(user);
+
+
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else {