2.14

PCS/src/main/java/cn/cslg/permission/common/utils/auth/AuthAop.java

@@ -29,8 +29,6 @@ import java.util.List;
 @Aspect
 @Component
 public class AuthAop {
-    @Value("${authorUrl}")
-    private String url;
     @Autowired
     private DataController dataController;
     @Autowired

PCS/src/main/java/cn/cslg/permission/controller/DepartmentController.java

@@ -58,4 +58,10 @@ public class DepartmentController {
         return departmentService.getDepartmentList();
     }
 
+    @GetMapping("/getTenantDepartments")
+    @Operation(summary = "查询本租户部门")
+    public String getTenantDepartments() {
+        return departmentService.getTenantDepartments();
+    }
+
 }

PCS/src/main/java/cn/cslg/permission/controller/SystemController.java

@@ -107,6 +107,12 @@ public class SystemController {
         return systemService.getAllPersonnel();
     }
 
+    @GetMapping("/getTenantPersonnel")
+    @Operation(summary = "获取租户所有人员")
+    public String getTenantPersonnel(Integer tenantId) {
+        return systemService.getTenantPersonnel(tenantId);
+    }
+
     @PostMapping("/queryPageList")
     @Operation(summary = "分页查询人员")
     public String queryPageList(@RequestBody PersonnelVO personnelVO) {

PCS/src/main/java/cn/cslg/permission/service/DepartmentService.java

@@ -163,6 +163,14 @@ public class DepartmentService extends ServiceImpl<DepartmentMapper, Department>
         return Response.success(treeGenerate(lst));
     }
 
+    public String getTenantDepartments() {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+        LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Department::getTenantId, personnelVO.getTenantId());
+        List<Department> lst = this.list(queryWrapper);
+        return Response.success(treeGenerate(lst));
+    }
+
     public String getDepartmentListForRMS() {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -256,6 +256,7 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         return Response.success(setPersonnelToVO(personnelList));
     }
 
+
     public String queryPageList(PersonnelVO personnelVO) {
         PersonnelVO personnelVO1 = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();

PCS/src/main/java/cn/cslg/permission/service/SystemService.java

@@ -196,7 +196,21 @@ public class SystemService {
     public String getAllPersonnel() {
         return Response.success(personnelService.list());
     }
+    /**
+     * @author 沈永艺
+     * @title 获取租户所有人员
+     * @description 获取所有的人员
+     */
+    public String getTenantPersonnel(Integer tenantId) {
+        if(tenantId==null){
 
+            PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+            tenantId= personnelVO.getTenantId();
+        }
+        LambdaQueryWrapper<Personnel> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(Personnel::getTenantId,tenantId);
+        return Response.success(personnelService.list(queryWrapper));
+    }
     /**
      * @author 李仁杰
      * @title 根据id查询人员

PCS/src/main/java/cn/cslg/permission/service/TenantService.java

@@ -219,7 +219,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
     public IPage<Tenant> getTenants(Integer tenantId, String tenantName, List<String> names, Integer current, Integer size) {
         IPage<Tenant> tenants;
         LambdaQueryWrapper<Tenant> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if (names != null) {
+        if (names != null&& names.size()!=0) {
             lambdaQueryWrapper.like(Tenant::getTenantName, tenantName).eq(Tenant::getTenantStatus, 1);
             lambdaQueryWrapper.and(wrapper -> wrapper.in(Tenant::getTenantName, names).or().eq(Tenant::getId, tenantId));
         } else {