修改员工，同步至OA,支出多组织，多职位

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -135,11 +135,11 @@ public class SysUser implements Serializable{
 
 	private String certificateType;
 
-	@ApiModelProperty(value = "部门id",required = false)
-	private Integer deptId;
+	@ApiModelProperty(value = "部门ids",required = false)
+	private String deptIds;
 
 	@ApiModelProperty(value = "岗位id",required = false)
-	private Integer postId;
+	private String postIds;
 
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCard;
@@ -434,20 +434,20 @@ public class SysUser implements Serializable{
 		this.currentGradeNum = currentGradeNum;
 	}
 
-	public Integer getDeptId() {
-		return deptId;
+	public String getDeptIds() {
+		return deptIds;
 	}
 
-	public void setDeptId(Integer deptId) {
-		this.deptId = deptId;
+	public void setDeptIds(String deptId) {
+		this.deptIds = deptId;
 	}
 
-	public Integer getPostId() {
-		return postId;
+	public String getPostIds() {
+		return postIds;
 	}
 
-	public void setPostId(Integer postId) {
-		this.postId = postId;
+	public void setPostIds(String postIds) {
+		this.postIds = postIds;
 	}
 
 	public String getBankCard() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -54,11 +54,11 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
 
-	@ApiModelProperty(value = "部门id",required = false)
-	private Integer depId;
+	@ApiModelProperty(value = "部门ids",required = false)
+	private String depIds;
 
-	@ApiModelProperty(value = "岗位id",required = false)
-	private Integer postId;
+	@ApiModelProperty(value = "岗位ids",required = false)
+	private String postIds;
 
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCard;
@@ -228,20 +228,20 @@ public class Employee extends SysUser {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public Integer getDeptId() {
-		return depId;
+	public String getDeptIds() {
+		return depIds;
 	}
 
-	public void setDeptId(Integer deptId) {
-		this.depId = deptId;
+	public void setDeptIds(String deptIds) {
+		this.depIds = deptIds;
 	}
 
-	public Integer getPostId() {
-		return postId;
+	public String getPostIds() {
+		return postIds;
 	}
 
-	public void setPostId(Integer postId) {
-		this.postId = postId;
+	public void setPostIds(String postIds) {
+		this.postIds = postIds;
 	}
 
 	public String getBankCard() {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -3,6 +3,8 @@ package com.ym.mec.biz.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.GroupType;
@@ -10,11 +12,9 @@ import com.ym.mec.biz.service.ImUserFriendService;
 import com.ym.mec.biz.service.OaUserService;
 import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
-import com.ym.mec.oa.OaFeignService;
 import com.ym.mec.oa.entity.OAUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -117,8 +117,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		oaUser.setUserName(employee.getRealName());
 		oaUser.setNickName(employee.getRealName());
 		oaUser.setPhone(employee.getPhone());
-		oaUser.setDeptId(employee.getDeptId());
-		oaUser.setPostId(employee.getPostId());
+		oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+		oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class));
 		if(user != null){
 			oaUser.setAvatar(user.getAvatar());
 		}
@@ -158,8 +158,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		oaUser.setUserName(employee.getRealName());
 		oaUser.setNickName(employee.getRealName());
 		oaUser.setPhone(employee.getPhone());
-		oaUser.setDeptId(employee.getDeptId());
-		oaUser.setPostId(employee.getPostId());
+		oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+		oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class));
 		oaUser.setAvatar(sysUser.getAvatar());
 		oaUserService.updateOaUser(oaUser);
 	}

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -23,8 +23,8 @@
         <result column="demission_date_" property="demissionDate"/>
         <result column="contact_address_" property="contactAddress"/>
         <result column="postal_code_" property="postalCode"/>
-        <result column="dept_id_" property="deptId"/>
-        <result column="post_id_" property="postId"/>
+        <result column="dept_ids_" property="deptIds"/>
+        <result column="post_ids_" property="postIds"/>
         <result column="bank_card_" property="bankCard"/>
         <result column="open_bank_address_" property="openBankAddress"/>
     </resultMap>
@@ -74,9 +74,9 @@
         -->
         INSERT INTO employee
         (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
-        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_ids_,post_ids_)
         VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
-        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptIds},#{postIds})
     </insert>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
@@ -135,6 +135,12 @@
             <if test="demissionDate != null">
                 demission_date_ = #{demissionDate},
             </if>
+            <if test="deptIds != null">
+                dept_ids_ = #{deptIds},
+            </if>
+            <if test="postIds != null">
+                post_ids_ = #{postIds},
+            </if>
         </set>
         WHERE user_id_ = #{userId}
     </update>

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

@@ -1,5 +1,7 @@
 package com.ym.mec.oa.entity;
 
+import java.util.List;
+
 public class OAUser {
     private Integer mecUserId;
 
@@ -11,9 +13,9 @@ public class OAUser {
 
     private String avatar;
 
-    private Integer deptId;
+    private List<Integer> deptIds;
 
-    private Integer postId;
+    private List<Integer> postIds;
 
     public Integer getMecUserId() {
         return mecUserId;
@@ -55,19 +57,19 @@ public class OAUser {
         this.avatar = avatar;
     }
 
-    public Integer getDeptId() {
-        return deptId;
+    public List<Integer> getDeptIds() {
+        return deptIds;
     }
 
-    public void setDeptId(Integer deptId) {
-        this.deptId = deptId;
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
     }
 
-    public Integer getPostId() {
-        return postId;
+    public List<Integer> getPostIds() {
+        return postIds;
     }
 
-    public void setPostId(Integer postId) {
-        this.postId = postId;
+    public void setPostIds(List<Integer> postIds) {
+        this.postIds = postIds;
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -136,8 +136,8 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
-            sysUser.setDeptId(employee.getDeptId());
-            sysUser.setPostId(employee.getPostId());
+            sysUser.setDeptIds(employee.getDeptIds());
+            sysUser.setPostIds(employee.getPostIds());
             sysUser.setBankCard(employee.getBankCard());
             sysUser.setOpenBankAddress(employee.getOpenBankAddress());
             return succeed(sysUser);