diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java
index 4a64ff6..6936047 100644
--- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java
+++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java
@@ -34,6 +34,8 @@ public class BeanConsumeArticle {
private String type; //类型source_type 9、10打赏，11付费
@ExcelIgnore
private Integer payMode; // 0 打赏 1 付费 2 其他
+ @ExcelIgnore
+ private Integer flag;
@ExcelProperty("金豆总数")
private String beanNum; //金豆数量
@ExcelProperty("付费金豆数")
diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java
index 5dd5be6..8ca5277 100644
--- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java
+++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java
@@ -44,6 +44,8 @@ public class BeanConsumeFan {
@ExcelIgnore
private Integer payType; //支付方式（直播：12345，铁粉：7，文章：8）
@ExcelIgnore
+ private Integer flag; //是否包含员工
+ @ExcelIgnore
private String sortField; //排序字段
@ExcelIgnore
private String sortOrder; //排序顺序
diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
index 177d7b9..f39d893 100644
--- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
+++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
@@ -36,6 +36,8 @@ public class BeanConsumeLive {
//文章： 1. 打赏2. 付费
//@ExcelProperty("类型" )
@ExcelIgnore
+ private Integer flag;
+ @ExcelIgnore
private String type; //类型
@ExcelProperty("礼物")
private String gift; //礼物名称
diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java
index 3230e04..725ea1b 100644
--- a/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java
+++ b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java
@@ -20,6 +20,7 @@ public class BeanUser {
private String name; //姓名
private Integer jwcode; //精网号
private String dept; //分部
+ private String flag; //是否包含员工
private Integer beanNum; //金豆数量
private Integer buyBean; //付费金豆
private Integer freeBean; //免费金豆
diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
index 6130efb..8bb547e 100644
--- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml
+++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
@@ -142,6 +142,9 @@
AND fm.jwcode = #{beanConsumeFan.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanConsumeFan.dept}
@@ -182,6 +185,9 @@
AND fm.jwcode = #{beanConsumeFan.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanConsumeFan.dept}
@@ -222,6 +228,9 @@
AND fm.jwcode = #{beanConsumeArticle.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanConsumeArticle.dept}
@@ -283,6 +292,9 @@
AND fm.jwcode = #{beanConsumeArticle.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanConsumeArticle.dept}
diff --git a/src/main/resources/jindouMapper/BeanUser.xml b/src/main/resources/jindouMapper/BeanUser.xml
index 6d3ceeb..ae5785b 100644
--- a/src/main/resources/jindouMapper/BeanUser.xml
+++ b/src/main/resources/jindouMapper/BeanUser.xml
@@ -33,13 +33,16 @@
FROM fx_member fm
INNER JOIN fx_yaoqing fy ON fy.uid = fm.id
+ 1=1
AND fm.jwcode = #{beanUser.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanUser.dept}
-
@@ -72,6 +75,9 @@
AND fm.jwcode = #{beanUser.jwcode}
+
+ AND fm.employee = 0
+
AND fm.dept = #{beanUser.dept}
diff --git a/src/main/resources/liveMapper/LiveMapper.xml b/src/main/resources/liveMapper/LiveMapper.xml
index eafd297..602ecb5 100644
--- a/src/main/resources/liveMapper/LiveMapper.xml
+++ b/src/main/resources/liveMapper/LiveMapper.xml
@@ -22,9 +22,13 @@
LEFT JOIN live_pindao lp ON lp.pd_id = l.channel_id
LEFT JOIN member_info mi ON mi.jwcode = lgg.jwcode
+ 1=1
AND lgg.jwcode = #{beanConsumeLive.jwcode}
+ /*是否看员工数据，live表1是员工，0是非员工，与金币表相反*/
+ AND mi.employee = 0
+
AND mi.deptName = #{beanConsumeLive.dept}
@@ -77,6 +81,10 @@
AND lgg.jwcode = #{beanConsumeLive.jwcode}
+ /*是否看员工数据，live表1是员工，0是非员工，与金币表相反*/
+ AND EXISTS (SELECT 1 FROM member_info mi
+ WHERE mi.jwcode = lgg.jwcode AND mi.employee = 0)
+
AND lgg.created_at BETWEEN #{beanConsumeLive.startTime} AND #{beanConsumeLive.endTime}