Merge branch 'master-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/CompanySearchVO.java

@@ -13,4 +13,9 @@ public class CompanySearchVO extends BranchCompany {
     String companyName;
 
     String levelName;
+
+    Integer imUserid;
+
+    Integer appUserId;
+
 }

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

@@ -22,7 +22,7 @@
     </resultMap>
 
     <select id="search" parameterType="com.github.wxiaoqi.security.admin.dto.CompanySearchDTO" resultType="com.github.wxiaoqi.security.admin.vo.CompanySearchVO">
-        select c.*,i.name as companyName,l.name as levelName
+        select c.*,i.name as companyName,l.name as levelName,ul.im_userid as imUserid,i.app_user_id as appUserId
         <if test="lon != null and lat != null">
             , ROUND(( (2 * ASIN( SQRT( POW( SIN((c.latitude * PI() / 180.0
             -${lat} * PI() / 180.0)/2), 2)
@@ -33,6 +33,7 @@
         from branch_company c
         LEFT JOIN  company_info i on  c.company_id=i.id
         LEFT JOIN  branch_company_level l on  c.branch_type=l.level
+        LEFT JOIN  app_user_login  ul on  i.app_user_id=ul.id
         <where>
              c.is_del = 0
             <if test="id != null">