From e14a6debcb17348164f703fcb2a7b9b1c3608352 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 二月 2024 10:19:32 +0800
Subject: [PATCH] 提交版本
---
meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java b/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
index c384ea3..343c49f 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
@@ -5,12 +5,15 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.sinata.common.enums.EnumCityRole;
import com.sinata.core.base.controller.BaseController;
import com.sinata.core.base.tips.ErrorTip;
import com.sinata.core.base.tips.SuccessTip;
import com.sinata.core.common.annotion.BussinessLog;
import com.sinata.core.common.annotion.Permission;
import com.sinata.core.common.constant.factory.PageFactory;
+import com.sinata.core.shiro.ShiroKit;
+import com.sinata.core.shiro.ShiroUser;
import com.sinata.core.util.DateUtils2;
import com.sinata.core.util.ExcelExportUtil;
import com.sinata.core.util.ExcelImportUtil;
@@ -77,9 +80,25 @@
if (StrUtil.isNotBlank(endTime)) {
endTime = endTime.replace("-", "");
}
+
+ String cityCode = "";
+ try {
+ // 【城市管理员】数据查询
+ ShiroUser shiroUser = ShiroKit.getUser();
+ if (shiroUser.getRoleList().contains(EnumCityRole.PROVINCE_ROLE.index)) {
+ // 省级城市管理员
+ cityCode = shiroUser.getCityCode().substring(0, 2);
+ } else if (shiroUser.getRoleList().contains(EnumCityRole.CITY_ROLE.index)) {
+ // 市级城市管理员
+ cityCode = shiroUser.getCityCode().substring(0, 4);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
// 查询数据列表
- page.setTotal(commissionSettlementMonthService.queryListCount(beginTime, endTime, condition, condition1, condition2, condition3, null));
- List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, condition3, null, page.getCurrent(), page.getSize());
+ page.setTotal(commissionSettlementMonthService.queryListCount(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null));
+ List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null, page.getCurrent(), page.getSize());
page.setRecords(list);
return super.packForBT(page);
}
@@ -87,7 +106,7 @@
@Permission
@ResponseBody
@RequestMapping(value = "/export")
- public void exportOrder(String beginTime, String endTime, String condition, String condition1, String condition2, Integer condition3, HttpServletResponse response) throws IOException {
+ public void exportOrder(String beginTime, String endTime, String condition, String condition1, String condition2, String cityCode, Integer condition3, HttpServletResponse response) throws IOException {
// 时间搜索
if (StrUtil.isNotBlank(beginTime)) {
beginTime = beginTime.replace("-", "");
@@ -96,7 +115,7 @@
endTime = endTime.replace("-", "");
}
// 查询数据列表
- List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, condition3, null, null, null);
+ List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null, null, null);
List<List<Object>> dataList = new ArrayList<>();
List<Object> titles = CollUtil.newArrayList(
--
Gitblit v1.7.1