Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/AuthHandler.java

@@ -70,7 +70,7 @@ public class AuthHandler {
 
     public LoginSuccessDTO addPcLoginCache(BackUserAccountVO user) {
         // 查询单位信息
-        CompanyInfoVO companyInfoVO = companyService.getCompanyInfoByBackUserAccountId(user.getId());
+        CompanyInfoVO companyInfoVO = companyService.getCompanyInfoByAppLoginUserId(user.getId());
         companyInfoVO.setLeader(1);
         // 角色信息
         RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(user.getId());

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CompanyDao.java

@@ -62,12 +62,20 @@ public interface CompanyDao {
     List<CompanyInfoDO> listCompanyPage(CompanyInfoQO param);
 
     /**
-     * 通过用户ID获取单位信息
+     * 通过用户ID获取单位信息 小程序
      *
      * @param backUserAccountId
      * @return
      */
     CompanyInfoDO getCompanyInfoByBackUserAccountId(Integer backUserAccountId);
+    /**
+     * 通过用户ID获取单位信息 后台管理
+     *
+     * @param backUserAccountId
+     * @return
+     */
+    CompanyInfoDO getCompanyInfoByAppLoginUserId(Integer backUserAccountId);
+
 
     /**
      * 添加绑定关系

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

@@ -64,6 +64,8 @@ public interface CompanyService {
      */
     CompanyInfoVO getCompanyInfoByBackUserAccountId(Integer backUserAccountId);
 
+
+    CompanyInfoVO getCompanyInfoByAppLoginUserId(Integer backUserAccountId);
     /**
      * 添加绑定关系
      *

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -104,7 +104,7 @@ public class CompanyServiceImpl implements CompanyService {
 
     @Override
     public ResultBody<CompanyInfoVO> listCompanyPage(CompanyInfoQO param, LoginSuccessDTO loginSuccessDTO) {
-        CompanyInfoDO companyInfoDO = companyDao.getCompanyInfoByBackUserAccountId(loginSuccessDTO.getUserAccountId());
+        CompanyInfoDO companyInfoDO = companyDao.getCompanyInfoByAppLoginUserId(loginSuccessDTO.getUserAccountId());
         if (companyInfoDO != null && !companyInfoDO.getCompanyType().equals(0)) {
             param.setCompanyInfoId(companyInfoDO.getId());
         }
@@ -129,6 +129,15 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
+    public CompanyInfoVO getCompanyInfoByAppLoginUserId(Integer backUserAccountId) {
+        CompanyInfoDO companyInfoDO = companyDao.getCompanyInfoByAppLoginUserId(backUserAccountId);
+        if (companyInfoDO != null) {
+            return companyInfoDO.buildCompanyInfoVO();
+        }
+        return null;
+    }
+
+    @Override
     public void addCompanyBackUser(CompanyBackUserDO companyBackUserDO) {
         companyDao.addCompanyBackUser(companyBackUserDO);
     }

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

@@ -288,4 +288,10 @@
     <select id="selectUserByUserRcd" resultType="java.lang.Integer">
         select count(id) from user_rcd where user_account_id = #{userId}
     </select>
+    <select id="getCompanyInfoByAppLoginUserId" 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,
+               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
+        FROM company_back_user cbu INNER JOIN company_info ci ON ci.id = cbu.company_info_id
+        WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0
+    </select>
 </mapper>

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: 527be833aa267709714cdd38b753819989b59802
+  newTag: 2488bdc48f7bd5352ecfbcc5ee9f4e384834e29b