Merge branch 'develop'

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

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

@@ -25,4 +25,7 @@ public class CompanyMemberVO implements Serializable {
 
     @ApiModelProperty(value = "角色姓名")
     private String roleName;
+
+    @ApiModelProperty(value = "用户信息")
+    private UserAccountVO userAccountVO;
 }

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/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -92,10 +93,11 @@ public class CompanyServiceImpl implements CompanyService {
             // 设置手机号
             CompanyBackUserDO companyBackUserDO = companyDao.getCompanyBackUserByCompanyId(id);
             if (companyBackUserDO != null) {
-                BackUserAccountDO backUserAccountDO = backUserAccountDao.getBackUserAccountDO(companyBackUserDO.getBackUserAccountId());
+                Integer backUserAccountId = companyBackUserDO.getBackUserAccountId();
+                BackUserAccountDO backUserAccountDO = backUserAccountDao.getBackUserAccountDO(backUserAccountId);
                 if (backUserAccountDO != null) {
                     companyInfoVO.setPhoneNum(backUserAccountDO.getPhoneNum());
-                    companyInfoVO.setBackUserId(companyBackUserDO.getBackUserAccountId());
+                    companyInfoVO.setBackUserAccountId(backUserAccountId);
                 }
             }
             return ResultBody.success(companyInfoVO);
@@ -319,7 +321,20 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     public ResultBody listUserAndRoleByCompanyId(Integer companyInfoId) {
         List<CompanyMemberDO> companyMemberDOS = companyDao.selectUserAndRoleList(companyInfoId);
-        List<CompanyMemberVO> companyMemberVOS = companyMemberDOS.stream().map(CompanyMemberDO::builCompanyMemberVO).collect(Collectors.toList());
+        List<CompanyMemberVO> companyMemberVOS = new ArrayList<>();
+        // 遍历 companyMemberDOS 中的 userAccountId
+        for (CompanyMemberDO companyMemberDO : companyMemberDOS) {
+            Integer userAccountId = companyMemberDO.getUserAccountId();
+            UserAccountDO userAccount = userServiceDao.getUserAccountById(userAccountId);
+            UserAccountVO userAccountVO = userAccount.buildUserAccountVO();
+            CompanyMemberVO companyMemberVO = CompanyMemberVO.builder()
+                    .userAccountId(companyMemberDO.getUserAccountId())
+                    .roleId(companyMemberDO.getLeader())
+                    .roleName(companyMemberDO.getRoleName())
+                    .userAccountVO(userAccountVO)
+                    .build();
+            companyMemberVOS.add(companyMemberVO);
+        }
         return ResultBody.success(companyMemberVOS);
     }
 

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

@@ -158,10 +158,11 @@
 
     <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
-        WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0 and cm.is_leader = 1
+        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 limit 1
     </select>
 
     <select id="countCompanyBackUser" resultType="java.lang.Integer">
@@ -206,6 +207,7 @@
          where cm.company_info_id = #{companyInfoId} and ua.`disable` = 0
     </select>
 
+
     <select id="getAppCompanyInfoUId" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
         SELECT
             ci.id,

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

@@ -54,7 +54,6 @@ SELECT id, img_url, content, sender_user_id, receiver_user_id, create_time, back
 ORDER BY create_time desc
                   LIMIT #{messageQO.pageNo}
                   , #{messageQO.pageSize}
-
     </select>
     <select id="countUserMessage" resultType="java.lang.Integer">
         select count(*)

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 00def15c5d8ab2b6c630e8e210de91f6bb4e435a
+  newTag: dd11befc27e997158edb5fd386caa8c2c948aab2