瀏覽代碼

add 添加员工增加,岗位管理部门范围

river 4 年之前
父節點
當前提交
2b26b0db67

+ 5 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OaServiceImpl.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.service.OaUserService;
 import com.ym.mec.oa.OaFeignService;
 import com.ym.mec.oa.entity.OAUser;
+import com.ym.mec.oa.entity.PostDept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -30,9 +31,9 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
-        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), OAUser.postDept.class));
+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
         if (oaUser.getPostDeptIds() != null) {
-            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(OAUser.postDept::getPostId).collect(Collectors.toList());
+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
             oaUser.setPostIds(postIds);
         }
         return oaFeignService.register(oaUser);
@@ -50,9 +51,9 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
-        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), OAUser.postDept.class));
+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
         if (oaUser.getPostDeptIds() != null) {
-            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(OAUser.postDept::getPostId).collect(Collectors.toList());
+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
             oaUser.setPostIds(postIds);
         }
         return oaFeignService.updateUser(oaUser);

+ 3 - 26
mec-client-api/src/main/java/com/ym/mec/oa/entity/OAUser.java

@@ -19,39 +19,16 @@ public class OAUser {
 
     private List<Integer> postIds;
 
-    private List<postDept> postDeptIds;
+    private List<PostDept> postDeptIds;
 
-    public List<postDept> getPostDeptIds() {
+    public List<PostDept> getPostDeptIds() {
         return postDeptIds;
     }
 
-    public void setPostDeptIds(List<postDept> postDeptIds) {
+    public void setPostDeptIds(List<PostDept> postDeptIds) {
         this.postDeptIds = postDeptIds;
     }
 
-
-    public class postDept {
-        private Integer postId;
-
-        private List<Integer> deptIds;
-
-        public Integer getPostId() {
-            return postId;
-        }
-
-        public void setPostId(Integer postId) {
-            this.postId = postId;
-        }
-
-        public List<Integer> getDeptIds() {
-            return deptIds;
-        }
-
-        public void setDeptIds(List<Integer> deptIds) {
-            this.deptIds = deptIds;
-        }
-    }
-
     public Integer getMecUserId() {
         return mecUserId;
     }

+ 25 - 0
mec-client-api/src/main/java/com/ym/mec/oa/entity/PostDept.java

@@ -0,0 +1,25 @@
+package com.ym.mec.oa.entity;
+
+import java.util.List;
+
+public class PostDept {
+    private Integer postId;
+
+    private List<Integer> deptIds;
+
+    public Integer getPostId() {
+        return postId;
+    }
+
+    public void setPostId(Integer postId) {
+        this.postId = postId;
+    }
+
+    public List<Integer> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
+    }
+}