|
@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.entity.Organization;
|
|
import com.ym.mec.biz.dal.entity.Organization;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.service.ImUserFriendService;
|
|
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.GroupMember;
|
|
import com.ym.mec.im.entity.GroupModel;
|
|
import com.ym.mec.im.entity.GroupModel;
|
|
import com.ym.mec.oa.OaFeignService;
|
|
import com.ym.mec.oa.OaFeignService;
|
|
@@ -68,7 +69,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
@Autowired
|
|
@Autowired
|
|
private CooperationOrganDao cooperationOrganDao;
|
|
private CooperationOrganDao cooperationOrganDao;
|
|
@Autowired
|
|
@Autowired
|
|
- private OaFeignService oaFeignService;
|
|
|
|
|
|
+ private OaUserService oaUserService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Integer, Employee> getDAO() {
|
|
public BaseDAO<Integer, Employee> getDAO() {
|
|
@@ -121,7 +122,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
if(user != null){
|
|
if(user != null){
|
|
oaUser.setAvatar(user.getAvatar());
|
|
oaUser.setAvatar(user.getAvatar());
|
|
}
|
|
}
|
|
- addOaUser(oaUser);
|
|
|
|
|
|
+ oaUserService.addOaUser(oaUser);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -160,7 +161,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
oaUser.setDeptId(employee.getDeptId());
|
|
oaUser.setDeptId(employee.getDeptId());
|
|
oaUser.setPostId(employee.getPostId());
|
|
oaUser.setPostId(employee.getPostId());
|
|
oaUser.setAvatar(sysUser.getAvatar());
|
|
oaUser.setAvatar(sysUser.getAvatar());
|
|
- this.updateOaUser(oaUser);
|
|
|
|
|
|
+ oaUserService.updateOaUser(oaUser);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -412,16 +413,4 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
public List<Integer> queryUserRole(Integer sysUserId) {
|
|
public List<Integer> queryUserRole(Integer sysUserId) {
|
|
return employeeDao.queryUserRole(sysUserId);
|
|
return employeeDao.queryUserRole(sysUserId);
|
|
}
|
|
}
|
|
-
|
|
|
|
- @Override
|
|
|
|
- @Async
|
|
|
|
- public Object addOaUser(OAUser oaUser) {
|
|
|
|
- return oaFeignService.register(oaUser);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- @Async
|
|
|
|
- public Object updateOaUser(OAUser oaUser) {
|
|
|
|
- return oaFeignService.updateUser(oaUser);
|
|
|
|
- }
|
|
|
|
}
|
|
}
|