From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index 10e1c94..3ed3a85 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -57,7 +57,6 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- //先查出来父节点的信息
if (sysUserOrg.getUserId() != null) {
String createUserOrgCode = "";
List<SysOrganization> userOrgData = sysUser.getOrganizations();
@@ -67,6 +66,7 @@
}
}
if (!createUserOrgCode.isEmpty()) {
+ //查出用户的所有组织关系数据
Map<String, Object> map = new HashMap<String, Object>();
map.put("user_id", sysUserOrg.getUserId());
List<SysUserOrg> userOrgList = sysUserOrgService.getListByMap(map);
@@ -75,6 +75,10 @@
if (sysUserOrg.getId().equals(userOrgList.get(i).getId())) {
userOrgList.get(i).setOrgId(sysUserOrg.getOrgId());
}
+ else
+ {
+ userOrgList.get(i).setOrgId(sysUserOrg.getUpdateUserId());
+ }
userOrgList.get(i).setEnabled(sysUserOrg.getEnabled());
userOrgList.get(i).setCreateUserOrgCode(createUserOrgCode);
}
--
Gitblit v1.8.0