Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin/src/main/resources/mapper/UserMapper.xml

@@ -64,11 +64,12 @@
     SELECT
     u.*,
     c.`name` as companyName,
-    i.`name` as corporationName,
-    i.id  as corporationId
+    IFNULL(i.`name`,ci.`name`) as corporationName,
+    if(i.id > 0,i.id,u.corporation_id)  as corporationId
     FROM base_user  u
     LEFT JOIN  branch_company  c ON u.company_id=c.id
     LEFT JOIN company_info i ON c.company_id=i.id
+    LEFT JOIN company_info ci ON u.corporation_id=ci.id
     <where>
       <if test="companyId != null and companyId > 0">
         and u.company_id = #{companyId}