Merge branch 'master' into feature/master-homepage-20260115

# Conflicts:
#	airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java
#	airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -17,6 +17,7 @@ import com.sundot.airport.attendance.domain.portrait.WorkHoursStats;
 import com.sundot.airport.check.domain.CheckLargeScreenCommonDto;
 import com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto;
 import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
+import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
@@ -528,6 +529,16 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 重置指定部门中指定角色的人员的指定岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "重置指定部门中指定角色的人员的指定岗位", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetUserPostByDept")
+    public AjaxResult resetUserPostByDept(@RequestBody ResetUserPostDto resetUserPostDto) {
+        return toAjax(userService.resetUserPostByDept(resetUserPostDto));
+    }
+
+    /**
      * 重置指定人员的指定角色
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")

airport-common/src/main/java/com/sundot/airport/common/core/domain/ResetUserPostDto.java

@@ -0,0 +1,34 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 重置指定部门中指定角色的人员的指定岗位Dto
+ *
+ * @author sundot
+ * @date 2020/12/01
+ */
+@Data
+public class ResetUserPostDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID列表
+     */
+    private List<Long> deptIdList;
+
+    /**
+     * 角色key列表
+     */
+    private List<String> roleKeyList;
+
+    /**
+     * 父岗位ID列表
+     */
+    private List<Long> postParentIdList;
+
+}

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -303,4 +303,11 @@ public interface ISysUserService {
      * @return 首页-用户信息
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfo();
+
+    /**
+     * 重置指定部门中指定角色的人员的指定岗位
+     *
+     * @return 结果
+     */
+    public int resetUserPostByDept(ResetUserPostDto resetUserPostDto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -19,6 +19,7 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
+import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
@@ -1140,4 +1141,37 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfo() {
         return userMapper.homePageUserInfo();
     }
+
+    /**
+     * 重置指定部门中指定角色的人员的指定岗位
+     */
+    @Override
+    public int resetUserPostByDept(ResetUserPostDto resetUserPostDto) {
+        // 获取指定部门下指定角色的用户
+        List<Long> userIdList = new ArrayList<>();
+        resetUserPostDto.getDeptIdList().forEach(deptId -> {
+            List<SysUser> sysUserList = selectUserListByRoleKeyAndDeptId(resetUserPostDto.getRoleKeyList(), deptId);
+            List<Long> userIds = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+            userIdList.addAll(userIds);
+        });
+        // 获取指定岗位
+        List<Long> postIdList = new ArrayList<>();
+        resetUserPostDto.getPostParentIdList().forEach(postParentId -> {
+            List<SysPost> sysPostList = postMapper.selectPostByParentId(postParentId);
+            List<Long> postIds = sysPostList.stream().map(SysPost::getPostId).collect(Collectors.toList());
+            postIdList.addAll(postIds);
+        });
+        // 更新用户岗位
+        for (Long userId : userIdList) {
+            // 创建数据
+            SysUser user = new SysUser();
+            user.setUserId(userId);
+            user.setPostIds(postIdList.toArray(new Long[0]));
+            // 删除用户与岗位关联
+            userPostMapper.deleteUserPostByUserId(userId);
+            // 新增用户与岗位管理
+            insertUserPost(user);
+        }
+        return 1;
+    }
 }