Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz

common/src/main/resources/mapper/PrintLogMapper.xml

@@ -539,8 +539,10 @@
 
     <!--自定义sql-->
     <select id="getPrintLogListByCondition" resultMap="BaseResultMap">
-        SELECT * FROM Z_PRINT_LOG PL
+        SELECT PL.*, I.ITEM ,IT.DESCRIPTION ITEM_DESCRIPTION FROM Z_PRINT_LOG PL
-        WHERE SITE = #{site}
+        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>
 

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java

@@ -156,13 +156,14 @@ 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, "CJ_ZR,ADMINISTRATORS");
+        Integer cnt = userGroupMapper.findUserGroupByUser(site, user, list);
-        for (NwaUser nwaUser:nwaUsers) {
+        if (cnt > 0){
-            if (user.equals(nwaUser.getUserName())){
             return callItemMapper.findCallItemListPda(site,language,null,callItem);
         }
-        }
         return callItemMapper.findCallItemListPda(site,language,user,callItem);
     }
 

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java

@@ -28,4 +28,7 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
 
      List<UserGroup> selectUserGroupListByUserBo(@Param("userBo") String userBo);
      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);
+
 }

meapi/src/main/resources/mapper/UserGroupMapper.xml

@@ -370,4 +370,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>