From 7f43b897106123a07eab10d9fec38d7c7bd47eed Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 17 Jul 2020 09:46:39 +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 | 4 ++++
1 files changed, 4 insertions(+), 0 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 57b269b..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
@@ -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