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 @@ 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 5f934863..712f1d6c 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,12 +156,13 @@ public class CallItemServiceImpl extends ServiceImpl i String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); String language = LocaleContextHolder.getLocale().getLanguage(); + List list = new ArrayList<>(); + list.add("CJZR"); + list.add("ADMINISTRATORS"); callItem.setCallType(Constants.CALL_TYPE_MATERIAL); - List nwaUsers = nwaUserService.checkUserGroup(site, "CJ_ZR,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 6c4d4c74..2b5d5ea4 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 @@ -28,4 +28,7 @@ public interface UserGroupMapper extends BaseMapper { List 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 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 f56b8dd6..c45d6bef 100644 --- a/meapi/src/main/resources/mapper/UserGroupMapper.xml +++ b/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} + + + + +