From 5849272dc3d0f1c7c1274d8f047d54c67a0a208c Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 17 Aug 2021 14:13:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/dispatch/service/impl/CallItemServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
index f1db7876..9bfdd9ad 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
@@ -156,7 +156,7 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         String user = CommonMethods.getUser();
         String language = LocaleContextHolder.getLocale().getLanguage();
         callItem.setCallType(Constants.CALL_TYPE_MATERIAL);
-        List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site, "CJ_ZR,ADMINISTRATORS");
+        List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site, "CJZR,ADMINISTRATORS");
         for (NwaUser nwaUser:nwaUsers) {
             if (user.equals(nwaUser.getUserName())){
                 return callItemMapper.findCallItemListPda(site,language,null,callItem);

From 102a1e17bb605cdc17ddcce3e3f916b9e98b3d96 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 17 Aug 2021 14:14:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/mapper/PrintLogMapper.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml
index b1166863..aa9635f4 100644
--- a/common/src/main/resources/mapper/PrintLogMapper.xml
+++ b/common/src/main/resources/mapper/PrintLogMapper.xml
@@ -539,8 +539,10 @@
 
     <!--自定义sql-->
     <select id="getPrintLogListByCondition" resultMap="BaseResultMap">
-        SELECT * FROM Z_PRINT_LOG PL
-        WHERE SITE = #{site}
+        SELECT PL.*, I.ITEM ,IT.DESCRIPTION ITEM_DESCRIPTION FROM Z_PRINT_LOG PL
+        LEFT JOIN ITEM I ON I.HANDLE = PL.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE
+        WHERE PL.SITE = #{site}
         <if test="startFromDate != null">
             AND PL.CREATED_DATE_TIME >= #{startFromDate}
         </if>
@@ -559,6 +561,9 @@
         <if test="sfc != null and sfc != ''">
             AND PL.SFC = #{sfc}
         </if>
+        <if test="item != null and item != ''">
+            AND I.ITEM = #{item}
+        </if>
         ORDER BY PL.CREATED_DATE_TIME DESC
     </select>
 

From 40c3245f76a1b51eca61a3307220ce8b16cb2c31 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 17 Aug 2021 16:40:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispatch/service/impl/CallItemServiceImpl.java  | 11 ++++++-----
 .../mesnac/meapi/mapper/UserGroupMapper.java        |  3 +++
 meapi/src/main/resources/mapper/UserGroupMapper.xml | 13 +++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
index 9bfdd9ad..4c2a14fe 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
@@ -155,12 +155,13 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         String site = CommonMethods.getSite();
         String user = CommonMethods.getUser();
         String language = LocaleContextHolder.getLocale().getLanguage();
+        List<String> list = new ArrayList<>();
+        list.add("CJZR");
+        list.add("ADMINISTRATORS");
         callItem.setCallType(Constants.CALL_TYPE_MATERIAL);
-        List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site, "CJZR,ADMINISTRATORS");
-        for (NwaUser nwaUser:nwaUsers) {
-            if (user.equals(nwaUser.getUserName())){
-                return callItemMapper.findCallItemListPda(site,language,null,callItem);
-            }
+        Integer cnt = userGroupMapper.findUserGroupByUser(site, user, list);
+        if (cnt > 0){
+            return callItemMapper.findCallItemListPda(site,language,null,callItem);
         }
         return callItemMapper.findCallItemListPda(site,language,user,callItem);
     }
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
index 2fe80980..c2555f03 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
@@ -27,4 +27,7 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
                                      @Param("userGroup")String userGroup);
 
      Integer getUserGroupByUser(@Param("userBO")String userBO,@Param("userGroupBO")String userGroupBO);
+
+     Integer findUserGroupByUser(@Param("site")String site,@Param("user")String user,@Param("list")List<String> list);
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml
index 0b471f77..b2fa4c8c 100644
--- a/meapi/src/main/resources/mapper/UserGroupMapper.xml
+++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml
@@ -363,4 +363,17 @@
         SELECT COUNT(HANDLE)  FROM USER_GROUP_MEMBER ugm
         WHERE  ugm.USER_OR_GROUP_GBO=#{userBO} AND USER_GROUP_BO=#{userGroupBO}
     </select>
+
+    <!--自定义sql：查询用户是否在指定用户组-->
+    <select id="findUserGroupByUser" resultType="Integer">
+        SELECT COUNT(*)  FROM WIP.Z_NWA_USER ZNU
+        INNER JOIN WIP.USER_GROUP_MEMBER UGM ON UGM.USER_OR_GROUP_GBO = ZNU.HANDLE
+        INNER JOIN WIP.USER_GROUP UG ON UG.HANDLE = UGM.USER_GROUP_BO
+        WHERE ZNU.SITE = #{site} AND ZNU.USER_NAME = #{user}
+        AND UG.USER_GROUP IN
+        <foreach item="item" index="index" collection="list" open="(" close=")"  separator=",">UPPER(#{item})
+        </foreach>
+    </select>
+
+
 </mapper>