From 907ea143ba8e08d4ee8a6d5733bb89d838fe802a Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Mon, 18 Aug 2025 14:16:57 +0800
Subject: [PATCH] =?UTF-8?q?8.17=E5=8C=BA=E5=88=86=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   |  8 ++++++++
 src/main/java/com/example/demo/domain/entity/User.java    |  2 ++
 .../java/com/example/demo/domain/vo/coin/GoldDetail.java  |  2 ++
 src/main/resources/mapper/GoldDetailMapper.xml            | 15 ++++++++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ee89f5..031dec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,14 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>
diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java
index 60c4815..e5dc635 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -71,4 +71,6 @@ public class User implements Serializable {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private Integer flag;//是否员工号
+    @ExcelIgnore
+    private Integer UserFlag;//是否员工号
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
index e9845e8..f63847e 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
@@ -63,5 +63,7 @@ public class GoldDetail {
     private Date auditTime;
     @ExcelIgnore
     private List<String> markets;
+    @ExcelIgnore
+    private Integer UserFlag;// 用户标识
 
 }
diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml
index 3b13aaf..7c0d396 100644
--- a/src/main/resources/mapper/GoldDetailMapper.xml
+++ b/src/main/resources/mapper/GoldDetailMapper.xml
@@ -27,8 +27,10 @@
         left join market m on m.id=`user`.market
         <where>
             ugr.flag = 1 and
-            `user`.flag = 1 and
              ugr.audit_status IN (1,3)
+            <if test="UserFlag!=null and UserFlag.length > 0">
+                AND `user`.flag = #{UserFlag}
+            </if>
             <if test="jwcode != null">
                 and ugr.jwcode = #{jwcode}
             </if>
@@ -67,8 +69,10 @@
         from user_gold_record ugr
         <where>
             ugr.flag = 1 and
-            `user`.flag = 1 and
             ugr.audit_status IN (1,3)
+            <if test="UserFlag!=null and UserFlag.length > 0">
+                AND `user`.flag = #{UserFlag}
+            </if>
             <if test="jwcode != null">
                 and `ugr`.jwcode = #{jwcode}
             </if>
@@ -115,6 +119,9 @@
         from user u
         left join market m on u.market = m.id
         <where>
+            <if test="UserFlag!=null and UserFlag.length > 0">
+                AND `user`.flag = #{UserFlag}
+            </if>
             <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
@@ -150,7 +157,9 @@
         from `user`
 
         <where>
-            flag = 1
+            <if test="UserFlag!=null and UserFlag.length > 0">
+                AND `user`.flag = #{UserFlag}
+            </if>
             <if test="jwcode != null ">
                 and jwcode = #{jwcode}
             </if>