优化--后台查询加盟商家时候返回当前商家加盟的类型id

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyInfoVO.java

@@ -87,4 +87,7 @@ public class CompanyInfoVO implements Serializable {
 
     @ApiModelProperty(value = "绑定的客服id")
     private Integer companyBindUserId;
+
+    @ApiModelProperty(value = "加盟标签id")
+    private Integer cooperationTagId;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyInfoDO.java

@@ -55,6 +55,8 @@ public class CompanyInfoDO implements Serializable {
     private Double distance;
     @ApiModelProperty(value = "企业视频")
     private String profileUrl;
+    @ApiModelProperty(value = "加盟标签id")
+    private Integer cooperationTagId;
     public CompanyInfoDO(ApplyTagEditVO applyTagEditVO) {
         this.address = applyTagEditVO.getAddress();
         this.lon = applyTagEditVO.getLon();
@@ -77,6 +79,7 @@ public class CompanyInfoDO implements Serializable {
                 .backImg(this.backImg)
                 .distance(this.distance)
                 .profileUrl(this.profileUrl)
+                .cooperationTagId(this.cooperationTagId)
                 .build();
     }
 

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -158,9 +158,10 @@
 
     <select id="getCompanyInfoByBackUserAccountId" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
         SELECT ci.id, ci.company_type, ci.company_name, ci.full_name, ci.province, ci.city, ci.district, ci.address, ci.company_user_name,cbu.back_user_account_id,
-         ci.phone_num, ci.remark, ci.create_time,ci.brand_logo, ci.brand_name, ci.license_img, ci.credit_code, ci.content, ci.score,ci.lon,ci.lat, ci.back_img,cm.user_account_id
+         ci.phone_num, ci.remark, ci.create_time,ci.brand_logo, ci.brand_name, ci.license_img, ci.credit_code, ci.content, ci.score,ci.lon,ci.lat, ci.back_img,cm.user_account_id,ut.cooperation_tag_id
         FROM company_back_user cbu INNER JOIN company_info ci ON ci.id = cbu.company_info_id
         inner join company_member cm on cm.company_info_id = ci.id
+        left outer join user_tag ut on ut.user_account_id = cm.user_account_id
         WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0 and cm.is_leader = 1
     </select>