浏览代码

部门关联的岗位信息

buzhanyi 1 年之前
父节点
当前提交
4e77f06be0

+ 2 - 2
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDataPermController.java

@@ -75,12 +75,12 @@ public class SysDataPermController {
         }
         Set<String> deptIdSet = null;
         if (result.getData() != null) {
-            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<Long>>() {
+            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<String>>() {
             });
         }
         Set<String> menuIdSet = null;
         if (result.getData() != null) {
-            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
+            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
         }
         sysDataPermService.saveNew(sysDataPerm, deptIdSet, menuIdSet);

+ 5 - 9
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDeptController.java

@@ -258,19 +258,15 @@ public class SysDeptController {
      */
     @PostMapping("/listSysDeptPost")
     public ResponseResult<MyPageData<SysPostVo>> listSysDeptPost(
-            @MyRequestBody(required = true) Long deptId,
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
-        if (!sysDeptService.existId(deptId)) {
+            @RequestBody SysPostDto sysPostDtoFilter) {
+        if (!sysDeptService.existId(sysPostDtoFilter.getDeptId())) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
-        if (pageParam != null) {
-            PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        if (sysPostDtoFilter.getPageNum() != null) {
+            PageMethod.startPage(sysPostDtoFilter.getPageNum(), sysPostDtoFilter.getPageSize());
         }
         SysPost filter = MyModelUtil.copyTo(sysPostDtoFilter, SysPost.class);
-        String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
-        List<SysPost> sysPostList = sysPostService.getSysPostListByDeptId(deptId, filter, orderBy);
+        List<SysPost> sysPostList = sysPostService.getSysPostListByDeptId(sysPostDtoFilter.getDeptId(), filter, null);
         return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE));
     }
 

+ 3 - 3
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -87,11 +87,11 @@ public class SysUserController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<String> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {
+        Set<String> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<String>>() {
         });
-        Set<String> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {
+        Set<String> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<String>>() {
         });
-        Set<String> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {
+        Set<String> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<String>>() {
         });
         sysUser.setUserType(1);
         sysUserService.saveNew(sysUser, roleIdSet, deptPostIdSet, dataPermIdSet);

+ 6 - 0
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dto/SysPostDto.java

@@ -19,6 +19,12 @@ import javax.validation.constraints.*;
 @Data
 public class SysPostDto extends MyPageParam {
 
+    /**
+     * 岗位Id。
+     */
+    private Long deptId;
+
+
     /**
      * 岗位Id。
      */