1.13

PCS/src/main/java/cn/cslg/permission/common/model/vo/PersonnelVO.java

@@ -73,6 +73,13 @@ public class PersonnelVO extends BaseVO {
 
     /**
      * Front:
+     * Back:负责部门List
+     */
+    private List<Integer> dutyDeparts;
+
+
+    /**
+     * Front:
      * Back:用户组信息List
      */
     private List<UserGroupVO> groupList;

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

@@ -72,13 +72,12 @@ public class PersonnelController {
     @GetMapping("/getPersonnelList")
     @Operation(summary = "查询所有人员")
     public String getPersonnelList() {
-
         return personnelService.getPersonnelList(0);
     }
+
     @GetMapping("/getPerson")
     @Operation(summary = "根据id查询人员")
     public String getPerson(Integer id) {
-
         return Response.success(personnelService.getPerson(id));
     }
 
@@ -87,6 +86,7 @@ public class PersonnelController {
     public String getPersonnelListForRole(Integer roleId) {
         return personnelService.getPersonnelList(roleId);
     }
+
     @PostMapping("/getPersonnelIds")
     @Operation(summary = "查询租户下人员Ids")
     public List<Integer> getDataSourceByTableName(Integer tenantId) {

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

@@ -41,6 +41,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
     private final MessageUtils mailUtils;
     private final PersonRoleService personRoleService;
     private final PerDpService perDpService;
+    private final SystemService systemService;
 
     /**
      * @param loginVO 登录参数类
@@ -124,6 +125,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
 
         //部门职位绑定信息
         List<PersonnelVO.DP> dpList = perDpService.getDPBaseMessageByPersonnelId(personnel.getId());
+        List<Integer> dutyDeparts =systemService.getDutyDeparts(personnel.getId());
         //填充数据
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO
@@ -141,7 +143,9 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
                 .setTenantId(tenant.getId())
                 .setToken(StpUtil.getTokenValue())
                 .setRList(roleList)
-                .setDpList(dpList);
+                .setDpList(dpList)
+                 .setDutyDeparts(dutyDeparts);
+
         if (flag == 1) {
             personnelVO.setRoleType(1);
         } else if (flag == 2) {

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

@@ -259,7 +259,6 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
     public String queryPageList(PersonnelVO personnelVO) {
         PersonnelVO personnelVO1 = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
-
         if(personnelVO.getName()==null)
         {personnelVO.setName("");
         }
@@ -278,7 +277,6 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
             LambdaQueryWrapper<AssoDepartPos> qw = new LambdaQueryWrapper<>();
             qw.in(AssoDepartPos::getDepartmentId, personnelVO.getDepartmentIds());
             List<Integer> dpIds = departPosiService.list(qw).stream().map(AssoDepartPos::getId).collect(Collectors.toList());
-
             LambdaQueryWrapper<AssoPerDp> qw2 = new LambdaQueryWrapper<>();
             qw2.in(AssoPerDp::getDepartPosiId, dpIds);
             List<Integer> perIds = perDpService.list(qw2).stream().map(AssoPerDp::getPersonnelId).collect(Collectors.toList());
@@ -301,7 +299,6 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         if (personnelVO.getTenant() != null) {
             queryWrapper.eq(Personnel::getTenantId, personnelVO.getTenant());
         }
-
         SecurityUtils.startDataScope("/admin/user/check");
         List<Personnel> personnelList = this.page(new Page<>(personnelVO.getCurrent(), personnelVO.getSize()), queryWrapper).getRecords();
         SecurityUtils.startDataScope("/admin/user/check");