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

mec-biz/src/main/java/com/ym/mec/biz/service/OaUserService.java

@@ -18,4 +18,20 @@ public interface OaUserService {
      * @return
      */
     Object updateOaUser(OAUser oaUser);
+
+
+    /**
+     * 删除OA用户（软删除）
+     * @param oaUser
+     * @return
+     */
+    Object delOaUser(OAUser oaUser);
+
+
+    /**
+     * 恢复OA用户
+     * @param oaUser
+     * @return
+     */
+    Object reInsertOaUser(OAUser oaUser);
 }

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

@@ -242,10 +242,20 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employeeDao.updateUserLock(employeeId,1);
 				employeeDao.updateUserDemissionDate(employeeId);
 				sysUserFeignService.exitByPhone("system", sysUser.getPhone());
+
+				//更新OA信息
+				OAUser oaUser = new OAUser();
+				oaUser.setMecUserId(employee.getUserId());
+				oaUserService.delOaUser(oaUser);
 				break;
 			case REINSTATE:
 				//离职，如果有关联课程组教务老师，
 				employeeDao.updateUserDemissionDate(employeeId);
+
+				//更新OA信息
+				oaUser = new OAUser();
+				oaUser.setMecUserId(employee.getUserId());
+				oaUserService.reInsertOaUser(oaUser);
 				break;
 		}
 	}

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

@@ -24,4 +24,17 @@ public class OaServiceImpl implements OaUserService {
 	public Object updateOaUser(OAUser oaUser) {
 		return oaFeignService.updateUser(oaUser);
 	}
+
+	@Override
+	@Async
+	public Object delOaUser(OAUser oaUser) {
+		return oaFeignService.delUser(oaUser);
+
+	}
+
+	@Override
+	@Async
+	public Object reInsertOaUser(OAUser oaUser) {
+		return oaFeignService.reInsertUser(oaUser);
+	}
 }

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

@@ -30,4 +30,23 @@ public interface OaFeignService {
     @PostMapping(value = "/updateUser", consumes = MediaType.APPLICATION_JSON_VALUE)
     Object updateUser(@RequestBody OAUser oaUser);
 
+    /**
+     * 软删除
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/delUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object delUser(@RequestBody OAUser oaUser);
+
+
+    /**
+     * 恢复软删除的用户
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/reInsertUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object reInsertUser(@RequestBody OAUser oaUser);
+
 }