|
@@ -451,11 +451,21 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
public Result getKuaiShouOperateInfo(Integer pageNum, int pageSize, String startTime, String endTime, String userId) {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
|
|
|
-
|
|
|
+ String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+ Set<String> operatorUserIds = new HashSet<>();
|
|
|
|
|
|
try {
|
|
|
- //查询当前人员所有下级
|
|
|
- Set<String> operatorUserIds = getAffiliateId(userId);
|
|
|
+
|
|
|
+ if ("admin".equals(roleCode)) {
|
|
|
+ //所有运营
|
|
|
+ List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("Operation");
|
|
|
+ List<String> allManagerList = allOperationManagerList.stream().map(KuaiShouOperateGroupVo:: getUserId).collect(Collectors.toList());
|
|
|
+ operatorUserIds = new HashSet<>(allManagerList);
|
|
|
+ }else if (roleCode.contains("OperationManager")){
|
|
|
+ //查询当前人员所有下级
|
|
|
+ operatorUserIds = getAffiliateId(userId);
|
|
|
+ }
|
|
|
+
|
|
|
//2022-02-15 ==>> 20220215
|
|
|
long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
|
long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
|
|
@@ -512,9 +522,22 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
@Override
|
|
|
public Result exportKuaiShouOperateInfo(String startTime, String endTime, String userId, HttpServletResponse response) {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
+ String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+ Set<String> operatorUserIds = new HashSet<>();
|
|
|
+
|
|
|
try {
|
|
|
- //查询当前人员所有下级
|
|
|
- Set<String> operatorUserIds = getAffiliateId(userId);
|
|
|
+
|
|
|
+ if ("admin".equals(roleCode)) {
|
|
|
+ //所有运营
|
|
|
+ List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("Operation");
|
|
|
+ List<String> allManagerList = allOperationManagerList.stream().map(KuaiShouOperateGroupVo:: getUserId).collect(Collectors.toList());
|
|
|
+ operatorUserIds = new HashSet<>(allManagerList);
|
|
|
+ }else if (roleCode.contains("OperationManager")){
|
|
|
+ //查询当前人员所有下级
|
|
|
+ operatorUserIds = getAffiliateId(userId);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
//2022-02-15 ==>> 20220215
|
|
|
long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
|
long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
|