From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 99 ++++++++++++++++---------------------------------
1 files changed, 32 insertions(+), 67 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 51cc4c7..8da813a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3870,7 +3870,7 @@
userIdList.add(mgtBasePlatformDto.getUserId());
} else {
MgtUserIdByDept mgtUserIdByDept = new MgtUserIdByDept();
- mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getUserId());
+ mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getDeptId());
mgtUserIdByDept = remoteConfigService.getUserIdByDept(mgtUserIdByDept).getData();
userIdList = mgtUserIdByDept.getUserIdList();
}
@@ -3903,8 +3903,10 @@
MgtSimpleShopVo simpleShopVo;
HashSet<String> set = new HashSet<>();
// 遍历MgtMemberOrderPageVoList，获取shopId并添加到set中
- for (Long entity : shopIdList) {
- set.add(entity.toString());
+ if(null != shopIdList){
+ for (Long entity : shopIdList) {
+ set.add(entity.toString());
+ }
}
String joinedString = String.join(",", set);
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
@@ -3944,63 +3946,25 @@
List<Long> userIdList = new ArrayList<>();
if (mgtBasePlatformDto.getUserId() != null) {
userIdList.add(mgtBasePlatformDto.getUserId());
- }
- else {
- // 如果当前登陆人的可视权限是仅个人 只选择了部门也只能看自己的数据
- SysUser sysUser = SecurityUtils.getSysUser();
- if (sysUser.getDataScope().equals("5")){
- userIdList.add(sysUser.getUserId());
- }else{
- MgtUserIdByDept mgtUserIdByDept = new MgtUserIdByDept();
- mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getDeptId());
- mgtUserIdByDept = remoteConfigService.getUserIdByDept(mgtUserIdByDept).getData();
- userIdList = mgtUserIdByDept.getUserIdList();
- }
+ } else {
+ List<SysUser> data = remoteUserService.getUsersByDeptId(mgtBasePlatformDto.getDeptId()).getData();
+ userIdList.addAll(data.stream().map(SysUser::getUserId).collect(Collectors.toList()));
}
if (!userIdList.isEmpty()) {
mgtBasePlatformDto.setUserIdList(userIdList);
- }
- }else{
- // 没有选择筛选部门和员工 获取当前登陆人的可视权限
- SysUser sysUser = SecurityUtils.getSysUser();
- // 如果当前登陆人是查看个人数据
- Long userId1 = null;
- // 如果当前登陆人权限是查看部门数据
- List<Long> userList = new ArrayList<>();
- if (sysUser!=null){
- String dataScope = sysUser.getDataScope();
- if (!sysUser.getUserName().equals("admin")){
- if (org.springframework.util.StringUtils.hasLength(dataScope)){
- switch (dataScope){
- case "3":
- // 本部门数据 查询当前登陆人属于哪个部门 查询这个部门下所有员工关联的所有店铺
- MgtUserIdByDept mgtUserIdByDept = new MgtUserIdByDept();
- mgtUserIdByDept.setDeptId(sysUser.getDeptId());
- mgtUserIdByDept = remoteConfigService.getUserIdByDept(mgtUserIdByDept).getData();
- userList = mgtUserIdByDept.getUserIdList();
- mgtBasePlatformDto.setDeptId(sysUser.getDeptId());
- mgtBasePlatformDto.setUserIdList(userList);
- case "5":
- // 仅个人数据 查询当前登陆人关联店铺下的用户
- userId1 = sysUser.getUserId();
- userList.add(userId1);
- mgtBasePlatformDto.setDeptId(sysUser.getDeptId());
- mgtBasePlatformDto.setUserIdList(userList);
- break;
- }
- }
- }
}
}
//数据权限
List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
- if(null != userIdList){
- userIdList.addAll(userIds);
- }else{
- userIdList = userIds;
+ if(null != userIds){
+ if(null != userIdList){
+ userIdList.addAll(userIds);
+ }else{
+ userIdList = userIds;
+ }
+ mgtBasePlatformDto.setUserIdList(userIdList);
}
- mgtBasePlatformDto.setUserIdList(userIdList);
MgtTotalOrderTotalVo mgtTotalOrderTotalVo = new MgtTotalOrderTotalVo();
@@ -4232,6 +4196,17 @@
return totalActivityTotalVo;
}
+ //数据权限
+ List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
+ if(null != userIds){
+ List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
+ if(null == userIdList){
+ userIdList = new ArrayList<>();
+ }
+ userIdList.addAll(userIds);
+ mgtBasePlatformDto.setUserIdList(userIdList);
+ }
+
List<Long> shopIdList = remoteShopService.listShopIdByPlTotal(mgtBasePlatformDto).getData();
if (StringUtils.isNotBlank(mgtBasePlatformDto.getShopProvinceCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopCityCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopAreaCode())) {
if(shopIdList==null||shopIdList.isEmpty()){
@@ -4242,20 +4217,8 @@
shopIdList = new ArrayList<>();
shopIdList.add(mgtBasePlatformDto.getShopId());
}
- //数据权限
- List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
- if(null != userIds){
- BoardMemberTotalDto boardMemberTotalDto = new BoardMemberTotalDto();
- boardMemberTotalDto.setUserIds(userIds);
- List<Shop> shopList = remoteShopService.getShopBySysUserIds(boardMemberTotalDto);
- List<Long> collect = shopList.stream().map(Shop::getShopId).collect(Collectors.toList());
- if(null != shopIdList){
- shopIdList.addAll(collect);
- }else{
- shopIdList = collect;
- }
- mgtBasePlatformDto.setShopIdList(shopIdList);
- }
+ mgtBasePlatformDto.setShopIdList(shopIdList);
+
//获取基础统计
MgtPlTotalActivityTotalVo mgtTotalActivityTotalVo = orderMapper.getPlTotalActivityTotal(mgtBasePlatformDto);
totalActivityTotalVo.setOrderTotal(mgtTotalActivityTotalVo.getOrderTotal());
@@ -4362,8 +4325,10 @@
}
HashSet<String> set = new HashSet<>();
// 遍历MgtMemberOrderPageVoList，获取shopId并添加到set中
- for (Long shopId : mgtBasePlatformDto.getShopIdList()) {
- set.add(shopId.toString());
+ if(null != mgtBasePlatformDto.getShopIdList()){
+ for (Long shopId : mgtBasePlatformDto.getShopIdList()) {
+ set.add(shopId.toString());
+ }
}
// 将set中的shopId转换为逗号分隔的字符串
String joinedString = String.join(",", set);
--
Gitblit v1.7.1