|
@@ -37,7 +37,7 @@ public class WxUserService extends BaseService {
|
|
userId = user.getUserId();
|
|
userId = user.getUserId();
|
|
wxUser = WxUser.builder().userId(userId).email(user.getEmail()).name(user.getName())
|
|
wxUser = WxUser.builder().userId(userId).email(user.getEmail()).name(user.getName())
|
|
.departId(user.getDepartIds()[0]).build();
|
|
.departId(user.getDepartIds()[0]).build();
|
|
- departs = getUserDepart(wxUser.getDepartId());
|
|
|
|
|
|
+ departs = getParentDepartMap(wxUser.getDepartId());
|
|
if (departs.size() > 0) {
|
|
if (departs.size() > 0) {
|
|
wxUser.setFirstDepartName(departs.get(0).getName());
|
|
wxUser.setFirstDepartName(departs.get(0).getName());
|
|
wxUser.setFirstDepartId(departs.get(0).getId());
|
|
wxUser.setFirstDepartId(departs.get(0).getId());
|
|
@@ -57,7 +57,7 @@ public class WxUserService extends BaseService {
|
|
|
|
|
|
for (Long departId : user.getDepartIds()) {
|
|
for (Long departId : user.getDepartIds()) {
|
|
wxUserDepart = WxUserDepart.builder().departId(departId).userId(userId).build();
|
|
wxUserDepart = WxUserDepart.builder().departId(departId).userId(userId).build();
|
|
- departs = getUserDepart(departId);
|
|
|
|
|
|
+ departs = getParentDepartMap(departId);
|
|
if (departs.size() > 0) {
|
|
if (departs.size() > 0) {
|
|
wxUserDepart.setFirstDepartName(departs.get(0).getName());
|
|
wxUserDepart.setFirstDepartName(departs.get(0).getName());
|
|
wxUserDepart.setFirstDepartId(departs.get(0).getId());
|
|
wxUserDepart.setFirstDepartId(departs.get(0).getId());
|
|
@@ -98,7 +98,7 @@ public class WxUserService extends BaseService {
|
|
return (WxUser) findObject("WxUserMapper.selectById", userId);
|
|
return (WxUser) findObject("WxUserMapper.selectById", userId);
|
|
}
|
|
}
|
|
|
|
|
|
- private List<WxDepart> getUserDepart(Long departId) throws Exception {
|
|
|
|
|
|
+ private List<WxDepart> getParentDepartMap(Long departId) throws Exception {
|
|
if (!userDepartMap.containsKey(departId)) {
|
|
if (!userDepartMap.containsKey(departId)) {
|
|
userDepartMap.put(departId, wxDepartService.findParentList(departId));
|
|
userDepartMap.put(departId, wxDepartService.findParentList(departId));
|
|
}
|
|
}
|