From 6dc49b0ce28587c821d294817e1a346147d93e98 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:48:36 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.14=20=E9=80=9A=E7=9F=A5=E6=B5=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/auth/controller/AuthController.java      | 9 ---------
 .../com/xujie/sys/modules/auth/data/AuthHistData.java    | 3 +++
 .../xujie/sys/modules/auth/mapper/AuthHistMapper.java    | 1 -
 .../modules/auth/service/impl/AuthHistServiceImpl.java   | 2 +-
 src/main/resources/mapper/auth/AuthGroupMemberMapper.xml | 5 +++--
 .../mapper/inquiry/InquiryApplicationMapper.xml          | 3 ++-
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java b/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java
index f2347d85..dd6e8f8f 100644
--- a/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java
+++ b/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java
@@ -133,15 +133,6 @@ public class AuthController {
     public R getAuthGroupBusinessList(@RequestBody AuthGroupData data) {
         List<AuthGroupMemberDataVo> row1 = authGroupMemberService.authGroupBusinessSearch(data);
         List<AuthGroupMemberDataVo> row2 = authGroupMemberService.authGroupBusinessSearch2(data);
-        // 将rows中row2的数据排除
-        for (AuthGroupMemberDataVo row : row2) {
-            for (int i = 0; i < row1.size(); i++) {
-                if (row1.get(i).getUserId().equals(row.getUserId())) {
-                    row1.remove(i);
-                    break;
-                }
-            }
-        }
         return R.ok().put("row1", row1).put("row2", row2);
     }
 
diff --git a/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java b/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java
index c6b6c764..12692767 100644
--- a/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java
+++ b/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java
@@ -77,5 +77,8 @@ public class AuthHistData implements Serializable {
     @TableField(exist = false)
     private Integer userId;
 
+    @TableField(exist = false)
+    private Boolean isSimultaneous;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java b/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java
index 599f18d6..724e9fba 100644
--- a/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java
+++ b/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java
@@ -17,7 +17,6 @@ public interface AuthHistMapper extends BaseMapper<AuthHistData> {
 
     List<AuthHistData> searchAuthInfo(AuthHistData data);
 
-    void authMailSend(String emails);
 }
 
 
diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
index 6af62952..c1361520 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
@@ -55,7 +55,7 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
     public void updateAuthHist(AuthHistData data) throws MessagingException, UnsupportedEncodingException {
         data.setAuthFlag("Y");
         data.setCanAuthFlag("N");
-        if (data.getRecordTypeDb().equals("1")) {
+        if (!data.getIsSimultaneous()) {
             this.updateById(data);
             // 找到相同quoteVersionNo的stepId大于于当前stepId的第一条记录
             QueryWrapper<AuthHistData> queryWrapper = new QueryWrapper<>();
diff --git a/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml b/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml
index 14f3a601..9c9cb42d 100644
--- a/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml
+++ b/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.xujie.sys.modules.auth.mapper.AuthGroupMemberMapper">
     <select id="authGroupBusinessSearch" resultType="com.xujie.sys.modules.auth.data.vo.AuthGroupMemberDataVo">
         -- 查找那些在 access_role 表中具有 role_no = 'A01' 但不在 auth_group_member 表中的用户
-        SELECT
+        SELECT DISTINCT
             su.user_id,
             su.username,
             su.user_display
@@ -14,11 +14,12 @@
                 LEFT JOIN
             sys_user AS su ON ar.username = su.username and ar.site = su.site
                 LEFT JOIN
-            auth_group_member AS agm ON su.user_id = agm.user_id
+            auth_group_member AS agm ON su.user_id = agm.user_id and agm.group_id = #{authGroupId}
         WHERE
             ar.role_no = 'A01'
             and ar.site = #{site}
             and su.status = 1
+        and agm.user_id is null
     </select>
     <select id="authGroupBusinessSearch2"
             resultType="com.xujie.sys.modules.auth.data.vo.AuthGroupMemberDataVo">
diff --git a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
index 8a3cf2a2..adca5e06 100644
--- a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
+++ b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
@@ -71,7 +71,8 @@
         a.remark as auth_hist_remark,
         a.can_auth_flag,
         a.last_step_flag,
-        a.record_type_db
+        a.record_type_db,
+        a.is_simultaneous
         FROM
         view_all_auth_info_with_email a
         LEFT JOIN plm_rfq_header b ON a.site = b.site