用户 批量导入的部门

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -118,17 +118,18 @@ public class UserController {
 
     /**
      * 使用文件导入用户信息
+     * departmentId 部门id 不传则默认0
+     * departmentCascade 部门层叠关系字符串 不传则默认"0"
      * file Excel文件
      */
     @RequestMapping("/importUser")
-    public HttpRespMsg importUser(@RequestParam MultipartFile file) {
-        return userService.importUser(file, request);
+    public HttpRespMsg importUser(Integer departmentId, String departmentCascade, @RequestParam MultipartFile file) {
+        return userService.importUser(departmentId, departmentCascade, file, request);
     }
 
 
     /**
-     * 切换权限
-     * 负责人可以将本公司的管理员切换至普通员工或者反之
+     * 切换权限 负责人可以将本公司的管理员切换至普通员工或者反之
      * id 目标id
      */
     @RequestMapping("/switchPermission")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -33,7 +33,8 @@ public interface UserService extends IService<User> {
     HttpRespMsg insertUser(String id, String name, String phone, Integer role, Double cost, Integer departmentId,
                            String departmentCascade, HttpServletRequest request);
 
-    HttpRespMsg importUser(MultipartFile multipartFile, HttpServletRequest request);
+    HttpRespMsg importUser(Integer departmentId, String departmentCascade, MultipartFile multipartFile,
+                           HttpServletRequest request);
 
     HttpRespMsg switchPermission(String id, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -355,7 +355,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //导入用户
     @Override
-    public HttpRespMsg importUser(MultipartFile multipartFile, HttpServletRequest request) {
+    public HttpRespMsg importUser(Integer departmentId, String departmentCascade, MultipartFile multipartFile,
+                                  HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //首先先搞到公司id
         Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -411,7 +412,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setPhone(phone)
                         .setRole(0)
                         .setCompanyId(companyId)
-                        .setCost(cost));
+                        .setCost(cost)
+                        .setDepartmentId(departmentId)
+                        .setDepartmentCascade(departmentCascade));
             }
             //最后删掉这个文件
 //            if (!file.delete()) {