From 4979a8065e83079057a6217554cda780e44bfa09 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:38:27 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
index 5407910..945e708 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
@@ -2,13 +2,12 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
-import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.RSAUtils;
import com.matrix.core.tools.UUIDUtil;
-import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
@@ -17,6 +16,7 @@
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -127,7 +127,9 @@
@ApiOperation(value = "首页", notes = "首页")
@GetMapping(value = "/frist")
public AjaxResult frist() {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ SysUsers user = getMe();
+ LogUtil.info("首页 shopId={}", user.getShopId());
+// SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
PadOrderListDto orderListDto = new PadOrderListDto();
orderListDto.setPageNum(1);
orderListDto.setPageSize(5);
@@ -139,9 +141,9 @@
if(ObjectUtil.isNotEmpty(user.getShopId())){
orderListDto.setShopId(user.getShopId());
}
-// if (!DataAuthUtil.hasAllShopAuth()) {
-// orderListDto.setShopId(user.getShopId());
-// }
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ orderListDto.setShopId(user.getShopId());
+ }
QueryUtil.setQueryLimitCom(orderListDto);
List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);
--
Gitblit v1.9.1