Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

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);