Merge branch 'develop'

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

@@ -176,7 +176,7 @@ public class MessageController  extends BaseController{
     @ApiOperation(value = "获取用户商家聊天次数")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("/getUserMessageNum")
-    public ResultBody getUserMessageNum(){
+    public ResultBody getUserMessageNum() {
         return messageService.getUserMessageNum();
     }
 
@@ -184,7 +184,7 @@ public class MessageController  extends BaseController{
     @ApiOperation(value = "获取用户与用户聊天次数")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("/getUserAndUserMessageNum")
-    public ResultBody getUserAndUserMessageNum(){
+    public ResultBody getUserAndUserMessageNum() {
         return messageService.getUserAndUserMessageNum();
     }
 

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

@@ -160,9 +160,14 @@
         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,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 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 limit 1
+        WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0
+--         超级管理员后台id是1没有绑定用户
+        <if test="baUserAccountId != 1">
+            and cm.is_leader = 1
+        </if>
+        limit 1
     </select>
 
     <select id="countCompanyBackUser" resultType="java.lang.Integer">

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

@@ -128,10 +128,10 @@ ORDER BY create_time desc
         WHERE DATE(create_time) = CURDATE() AND back_user_id IS NOT NULL
     </select>
     <select id="getUserAndUserMessageNum" resultType="java.lang.Integer">
-        SELECT
-            COUNT(*) AS count_distinct_pairs
-        FROM
-            ( SELECT DISTINCT sender_user_id, receiver_user_id FROM user_message WHERE DATE( create_time ) = CURDATE() AND back_user_id IS NULL ) AS distinct_pairs
+        SELECT COUNT(*) AS count_distinct_pairs
+        FROM (SELECT DISTINCT sender_user_id, receiver_user_id
+              FROM user_message
+              WHERE DATE (create_time) = CURDATE() AND back_user_id IS NULL ) AS distinct_pairs
     </select>
 
     <insert id="insertSystemMessage">

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

@@ -529,7 +529,7 @@
                create_time,
                update_time
         from user_account
-        where phone_num = #{phoneNum}
+        where phone_num like CONCAT('%', #{phoneNum}, '%')
           and disable = 0
     </select>
     <select id="getUserAccountInfoByOpenId" resultType="com.mmc.iuav.user.entity.UserAccountDO">

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: 74cf9abdbc41aeb21e05fc36104b19aa87e4b89a
+  newTag: 577801e63ba41f2636d280fd67337b99ccf1e004