fix

yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-    active: dev
-#    active: prod
+#    active: dev
+    active: prod
   #文件上传设置
   servlet:
     multipart:

yami-shop-service/src/main/resources/mapper/UserMapper.xml

@@ -105,7 +105,7 @@
 
 
     <select id="enterpriseUserList" resultType="com.yami.shop.bean.vo.EnterpriseUserVo">
-        SELECT a.user_id,a.`status`,a.real_name,a.user_mobile,a.channel_id,a.channel,a.real_name,a.phone,
+        SELECT a.user_id,a.`status`,a.real_name,a.user_mobile,a.channel_id,
         (SELECT channel_name FROM tz_channel WHERE id= a.channel_id) channelName,
         IFNULL((SELECT SUM(points) FROM tz_points_recharge WHERE user_id=a.user_id),0) total,
         IFNULL((SELECT SUM(points) FROM tz_points_recharge WHERE user_id=a.user_id and recharge_status=1),0) available,
@@ -133,21 +133,26 @@
         values (#{operator}, #{batchNo}, "员工导入", NOW(), NOW(), #{status}, #{channel}, #{realName}, #{phone})
     </insert>
 
-
     <select id="enterpriseUserLogList" resultType="com.yami.shop.bean.po.EnterpriseUserLogPo">
-        SELECT a.operator,
-               a.task_name,
-               a.batch_no,
-               MIN(a.create_time)   create_time,
-               MAX(a.complete_time) complete_time,
-               COUNT(1) 'total', IFNULL(
-                (SELECT COUNT(1) FROM tz_user_add_log WHERE `status` = 1 and batch_no = a.batch_no GROUP BY batch_no),
-                0) 'success', IFNULL(
-                (SELECT COUNT(1) FROM tz_user_add_log WHERE `status` = 0 and batch_no = a.batch_no GROUP BY batch_no),
-                0) 'error'
-        FROM tz_user_add_log a
-        GROUP BY a.batch_no
-        ORDER BY a.complete_time desc
+        SELECT b.batch_no,
+               b.operator,
+               b.task_name,
+               b.create_time,
+               b.complete_time,
+               b.total,
+               b.success,
+               b.error
+        FROM (SELECT batch_no,
+                     ANY_VALUE(operator)  AS operator,
+                     ANY_VALUE(task_name) AS task_name,
+                     MIN(create_time)     AS create_time,
+                     MAX(complete_time)   AS complete_time,
+                     COUNT(1)             AS total,
+                     SUM(`status` = 1)    AS success,
+                     SUM(`status` = 0)    AS error
+              FROM tz_user_add_log
+              GROUP BY batch_no) b
+        ORDER BY b.complete_time DESC
     </select>