From 9bd199395d1a6f683122c6d89ff5acacbe0e1996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 27 Apr 2021 13:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/service/impl/AbnormalBillServiceImpl.java     | 5 ++++-
 .../foreverwin/mesnac/common/service/AnomalyService.java  | 5 ++++-
 .../dispatch/service/impl/UserResourceServiceImpl.java    | 8 +++-----
 dispatch/src/main/resources/mapper/UserResourceMapper.xml | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 647f1a32..c7536567 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -739,7 +739,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
     @Override
-    public void createAnomalyTask(String category, String resource, String shopOrder, String sfc, String ncCodes,String position,String ncQty,String ncDescription) {
+    public void createAnomalyTask(String category, String resource, String shopOrder,
+                                  String sfc, String ncCodes,String position,String ncQty,
+                                  String ncDescription,String userGroup) {
         String site = CommonMethods.getSite();
         LocalDateTime now = LocalDateTime.now();
         String user = CommonMethods.getUser();
@@ -769,6 +771,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setPbDescription(ncDescription);
         abnormalBill.setDiscover(Constants.SELF_MADE);
         abnormalBill.setReportFrom(Constants.REPORT);
+        abnormalBill.setReportSendUserGroup(userGroup);
         AbnormalBillDispose abnormalBillDispose = new AbnormalBillDispose();
 
         abnormalBillDispose.setSite(site);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
index 08645410..75839c3a 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
@@ -16,5 +16,8 @@ public interface AnomalyService {
      * @param sfc
      * @param ncCodes
      */
-    void createAnomalyTask(String category, String resource, String shopOrder, String sfc, String ncCodes,String position,String ncQty,String ncDescription);
+
+    void createAnomalyTask(String category, String resource, String shopOrder,
+                           String sfc, String ncCodes,String position,String ncQty,
+                           String ncDescription,String userGroup);
 }
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
index f75e1261..8f9f4642 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
@@ -80,6 +80,7 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
     public void saveAll(List<UserResourceDto> userResourceDtoList,String resource,String user) {
         List<UserResource> userResourceList = new ArrayList<>();
         String site = CommonMethods.getSite();
+        userResourceMapper.deleteByUserAndResource(user,resource);
         for (int i = 0; i < userResourceDtoList.size(); i++) {
             UserResourceDto userResourceDto = userResourceDtoList.get(i);
             UserResource userResource = new UserResource();
@@ -102,10 +103,10 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
                 nwaUserService.saveOrUpdate(userByUserName);
             }
             userResource.setStatus(userResourceDto.getStatus());
-            userResource.setCreatedUser(CommonMethods.getUser());
             userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+
                     userResource.getResrce()+","+userResource.getUserId());
             if(userResourceMapper.selectById(userResource.getHandle()) == null){
+                userResource.setCreatedUser(CommonMethods.getUser());
                 userResource.setCreatedDateTime(LocalDateTime.now());
             }
             userResource.setModifiedUser(CommonMethods.getUser());
@@ -113,10 +114,7 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
 
             userResourceList.add(userResource);
         }
-        userResourceMapper.deleteByUserAndResource(user,resource);
+
         this.saveOrUpdateBatch(userResourceList);
     }
-
-
-
 }
\ No newline at end of file
diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index f15ae3d2..14a1d594 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -489,10 +489,10 @@
         DELETE FROM Z_USER_RESOURCE
         <where>
             <if test="user != null and user != ''">
-                USER_ID = #{user}
+                USER_ID LIKE '%${user}%'
             </if>
              <if test="resource != null and resource != ''">
-                AND RESRCE = #{resource}
+                AND RESRCE LIKE '%${resource}%'
              </if>
         </where>
     </select>