From 92da4f3a48357197e795f9fc61d532c996bba4c8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 19:50:52 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 853b8e5..951ca46 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
@@ -14,6 +14,7 @@
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysCompanyDao;
+import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
@@ -122,6 +123,9 @@
return result;
}
+ @Autowired
+ private SysUsersDao sysUsersDao;
+
@ApiOperation(value = "首页", notes = "首页")
@GetMapping(value = "/frist/{suId}")
public AjaxResult frist(@PathVariable Long suId) {
@@ -153,7 +157,12 @@
result.putInMap("orderList",padApiOrderListInPage);
Date date = new Date();
- List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
+ SysUsers shopstaffInfo = new SysUsers();
+ shopstaffInfo.setCompanyId(user.getCompanyId());
+ shopstaffInfo.setShopId(user.getShopId());
+ shopstaffInfo.setRoleName(Dictionary.STAFF_POST_MLS);
+ List<SysUsers> mls = sysUsersDao.selectByRoleName(shopstaffInfo);
+// List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
if(CollUtil.isNotEmpty(mls)){
SysBeauticianState sysBeauticianState = new SysBeauticianState();
sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
--
Gitblit v1.9.1