创建用户管理员 时的下拉框

src/main/java/com/cdf/controller/back/SysDeptController.java

@@ -96,28 +96,8 @@ public class SysDeptController extends BaseLogController{
     @PostMapping("/allList")
     @SysLog(logType = "組織架構",value = "查看組織架構")
     public ResultData list(){
-        Integer id = JwtUtil.getId(getToken());
-        User user = userService.getById(id);
-        if(user == null){
-            return ResultData.ok(new ArrayList<>());
-        }
-        Dept dept = deptService.getById(user.getDeptId());
-        if(dept == null){
-            return ResultData.ok(new ArrayList<>());
-        }
-        DeptVo vo = new DeptVo();
-        BeanUtils.copyProperties(dept,vo);
-        vo.setChildren(deptService.getDeptList(user.getDeptId()));
-//        if(user.getDeptId() != null && ( user.getDeptId() == 22 || user.getDeptId() == 33)){
-//            DeptVo vot = new DeptVo();
-//            Dept deptt = deptService.getById(1);
-//            BeanUtils.copyProperties(deptt,vot);
-//            vot.setHasChildren(0);
-//            vot.setCanDel(0);
-//            vot.setChildren(Arrays.asList(vo));
-//            return ResultData.ok(Arrays.asList(vot));
-//        }
-        return ResultData.ok(Arrays.asList(vo));
+        List<DeptVo> depts = deptService.getListByType(1,getToken());
+        return ResultData.ok(Arrays.asList(depts));
     }
 
 

src/main/java/com/cdf/controller/back/SysUserController.java

@@ -7,12 +7,15 @@ import com.cdf.common.LogInfoKey;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
+import com.cdf.entity.Dept;
 import com.cdf.entity.User;
 import com.cdf.entity.Video;
 import com.cdf.exception.BusinessException;
 import com.cdf.request.UserRequest;
 import com.cdf.request.UserUpdateRequest;
+import com.cdf.response.DeptVo;
 import com.cdf.response.UserVo;
+import com.cdf.service.IDeptService;
 import com.cdf.service.ILogService;
 import com.cdf.service.IUserService;
 import com.cdf.util.Base64Converter;
@@ -25,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
 
 
 @RestController
@@ -37,6 +42,8 @@ public class SysUserController extends BaseLogController {
     private String defaultPassword;
     @Autowired
     private ILogService logService;
+    @Autowired
+    private IDeptService deptService;
 
 
     @GetMapping("/getUserInfo")
@@ -146,6 +153,14 @@ public class SysUserController extends BaseLogController {
         return ResultData.ok();
     }
 
-
+    /**
+     * 创建用户时，所属架构下拉框
+     * @param type 0 管理员，1普通用户
+     */
+    @GetMapping("/getCreateUserDept")
+    public ResultData getCreateUserDept(@RequestParam(required = false) Integer type){
+        List<DeptVo> depts = deptService.getListByType(type,getToken());
+        return ResultData.ok(depts);
+    }
 }
 

src/main/java/com/cdf/service/IDeptService.java

@@ -21,4 +21,6 @@ public interface IDeptService extends IService<Dept> {
     List<Dept> getDeptSonList(Integer deptId);
 
     List<Integer> getDeptIdsSonList(Integer deptId);
+
+    List<DeptVo> getListByType(Integer type,String token);
 }

src/main/java/com/cdf/service/impl/DeptServiceImpl.java

@@ -1,15 +1,22 @@
 package com.cdf.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cdf.common.ResultData;
 import com.cdf.entity.Dept;
+import com.cdf.entity.User;
 import com.cdf.mapper.IDeptMapper;
 import com.cdf.response.DeptVo;
 import com.cdf.service.IDeptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cdf.service.IUserService;
+import com.cdf.util.JwtUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.lang.model.element.TypeElement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,6 +31,8 @@ import java.util.stream.Collectors;
 @Service
 public class DeptServiceImpl extends ServiceImpl<IDeptMapper, Dept> implements IDeptService {
 
+    @Autowired
+    IUserService userService;
 
     @Override
     public List<DeptVo> getDeptList(Integer parentId) {
@@ -79,4 +88,24 @@ public class DeptServiceImpl extends ServiceImpl<IDeptMapper, Dept> implements I
             getDeptSonListDg(deptList,dept.getId());
         }
     }
+
+
+    @Override
+    public List<DeptVo> getListByType(Integer type,String token) {
+        Integer id = JwtUtil.getId(token);
+        User user = userService.getById(id);
+        if(user == null){
+            return new ArrayList<>();
+        }
+        Dept dept = this.getById(user.getDeptId());
+        if(dept == null){
+            return new ArrayList<>();
+        }
+        DeptVo vo = new DeptVo();
+        BeanUtils.copyProperties(dept,vo);
+        if(type == 1){
+            vo.setChildren(this.getDeptList(user.getDeptId()));
+        }
+        return Arrays.asList(vo);
+    }
 }

src/main/java/com/cdf/service/impl/ShopServiceImpl.java

@@ -51,10 +51,12 @@ public class ShopServiceImpl extends ServiceImpl<IShopMapper, Shop> implements I
         }
         Integer id = JwtUtil.getId(param.getToken());
         User user = userService.getById(id);
-
-        FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
-
-        param.setDeptId(fdkkUser.getDeptId());
+        if(user.getRoleId() == 1 || user.getRoleId() == 2){
+            FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
+            param.setDeptId(fdkkUser.getDeptId());
+        }else {
+            param.setDeptId(user.getDeptId());
+        }
         List<Integer> deptIds = deptService.getDeptIdsSonList(param.getDeptId());
         wrapper.in(Shop::getDeptId,deptIds);