Merge branch 'gaohu-smile-0915-three' of...

Merge branch 'gaohu-smile-0915-three' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into gaohu-smile-0915-three

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -140,8 +140,14 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 //修改smile_user中普代总代信息
                 smileUserMapper.updateById(smileUser);
             });
+            oleOrganization.setName(smileOrganization.getName());
+            oleOrganization.setAgentId(smileOrganization.getAgentId());
+            smileOrganizationMapper.updateById(oleOrganization);
+            return AjaxResult.success();
         }
-        smileOrganizationMapper.updateById(smileOrganization);
+        //只改名
+        oleOrganization.setName(smileOrganization.getName());
+        smileOrganizationMapper.updateById(oleOrganization);
         return AjaxResult.success();
     }