From 545d46564c2551734620ac88644502817618ce33 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 22 Jul 2019 14:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/busi/SysOrganizeController.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
index bea6e70..c922652 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
@@ -118,13 +118,20 @@ public class SysOrganizeController extends CoreBaseController{
                     .notNull("organizeCode", organize.getOrganizeCode())
                     .notNull("organizeType", organize.getOrganizeType());
 
-            ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser());
+            SysOrganize sysOrganize = organizeService.getSysOrganizeById(organize.getId());
+
             if(organize.getParentId() == null || organize.getParentId() <= 0){
-                organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
-                organize.setParentNameRdd("顶级组织");
+                sysOrganize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
+                sysOrganize.setParentNameRdd("顶级组织");
             }
 
-            organizeService.updateSysOrganize(organize);
+            sysOrganize.setName(organize.getName());
+            sysOrganize.setOrganizeType(organize.getOrganizeType());
+            sysOrganize.setOrganizeAddress(organize.getOrganizeAddress());
+            sysOrganize.setOrganizeSort(organize.getOrganizeSort());
+            ConvertBean.modelUpdate(sysOrganize,getSessionUser());
+
+            organizeService.updateSysOrganize(sysOrganize);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);