处理人员评论BUG

alien-entity/src/main/java/shop/alien/entity/store/LifeLikeRecord.java

@@ -23,7 +23,7 @@ public class LifeLikeRecord {
 
     private String huifuId;
 
-    @ApiModelProperty(value = "1-评论 2-社区动态 3-活动 4-推荐菜 5-店铺打卡 6-二手商品 7-律师评分 8-点赞员工 9-员工评价点赞")
+    @ApiModelProperty(value = "1-评论 2-社区动态 3-活动 4-推荐菜 5-店铺打卡 6-二手商品 7-律师评分 8-点赞员工 9-员工评价点赞 10-员工评论点赞")
     private String type;
 
     private Integer dianzanCount;

alien-entity/src/main/resources/mapper/StoreStaffCommentMapper.xml

@@ -30,27 +30,27 @@
             ssc.review_id,
             ssc.send_user_id,
             ssc.receive_user_id,
-            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN sp_send.personnel_name
+                WHEN ssc.send_user_type = 2 THEN ssc_send.name
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_name
                 ELSE lu_send.user_name
             END AS send_user_name,
-            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN si_send.img_url
+                WHEN ssc.send_user_type = 2 THEN ssc_send.staff_image
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_image
                 ELSE lu_send.user_image
             END AS send_user_avatar,
-            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN sp_receive.personnel_name
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.name
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_name
                 ELSE NULL
             END AS receive_user_name,
-            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN si_receive.img_url
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.staff_image
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_image
                 ELSE NULL
             END AS receive_user_avatar,
@@ -70,19 +70,15 @@
         -- 发送用户：普通用户表
         LEFT JOIN life_user lu_send ON lu_send.id = ssc.send_user_id 
             AND lu_send.delete_flag = 0
-        -- 发送用户：员工表
-        LEFT JOIN store_personnel sp_send ON sp_send.id = ssc.send_user_id 
-            AND sp_send.delete_flag = 0
-        LEFT JOIN store_img si_send ON si_send.id = sp_send.img_id 
-            AND si_send.delete_flag = 0
+        -- 发送用户：员工配置表
+        LEFT JOIN store_staff_config ssc_send ON ssc_send.id = ssc.send_user_id 
+            AND ssc_send.delete_flag = 0
         -- 接收用户：普通用户表
         LEFT JOIN life_user lu_receive ON lu_receive.id = ssc.receive_user_id 
             AND lu_receive.delete_flag = 0
-        -- 接收用户：员工表
-        LEFT JOIN store_personnel sp_receive ON sp_receive.id = ssc.receive_user_id 
-            AND sp_receive.delete_flag = 0
-        LEFT JOIN store_img si_receive ON si_receive.id = sp_receive.img_id 
-            AND si_receive.delete_flag = 0
+        -- 接收用户：员工配置表
+        LEFT JOIN store_staff_config ssc_receive ON ssc_receive.id = ssc.receive_user_id 
+            AND ssc_receive.delete_flag = 0
         LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(ssc.id, CHAR)
             AND llr.type = '10' 
             AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)
@@ -100,27 +96,27 @@
             ssc.review_id,
             ssc.send_user_id,
             ssc.receive_user_id,
-            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN sp_send.personnel_name
+                WHEN ssc.send_user_type = 2 THEN ssc_send.name
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_name
                 ELSE lu_send.user_name
             END AS send_user_name,
-            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN si_send.img_url
+                WHEN ssc.send_user_type = 2 THEN ssc_send.staff_image
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_image
                 ELSE lu_send.user_image
             END AS send_user_avatar,
-            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN sp_receive.personnel_name
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.name
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_name
                 ELSE NULL
             END AS receive_user_name,
-            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN si_receive.img_url
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.staff_image
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_image
                 ELSE NULL
             END AS receive_user_avatar,
@@ -140,19 +136,15 @@
         -- 发送用户：普通用户表
         LEFT JOIN life_user lu_send ON lu_send.id = ssc.send_user_id 
             AND lu_send.delete_flag = 0
-        -- 发送用户：员工表
-        LEFT JOIN store_personnel sp_send ON sp_send.id = ssc.send_user_id 
-            AND sp_send.delete_flag = 0
-        LEFT JOIN store_img si_send ON si_send.id = sp_send.img_id 
-            AND si_send.delete_flag = 0
+        -- 发送用户：员工配置表
+        LEFT JOIN store_staff_config ssc_send ON ssc_send.id = ssc.send_user_id 
+            AND ssc_send.delete_flag = 0
         -- 接收用户：普通用户表
         LEFT JOIN life_user lu_receive ON lu_receive.id = ssc.receive_user_id 
             AND lu_receive.delete_flag = 0
-        -- 接收用户：员工表
-        LEFT JOIN store_personnel sp_receive ON sp_receive.id = ssc.receive_user_id 
-            AND sp_receive.delete_flag = 0
-        LEFT JOIN store_img si_receive ON si_receive.id = sp_receive.img_id 
-            AND si_receive.delete_flag = 0
+        -- 接收用户：员工配置表
+        LEFT JOIN store_staff_config ssc_receive ON ssc_receive.id = ssc.receive_user_id 
+            AND ssc_receive.delete_flag = 0
         LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(ssc.id, CHAR)
             AND llr.type = '10' 
             AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)