From f57554f7da5e4d05b4b4bab99bf49ac9ca8c2038 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Apr 2022 21:35:12 +0800
Subject: [PATCH] feat:商品资料导出新增时长字段
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index 70b7250..064d634 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -10,7 +10,6 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
@@ -28,6 +27,7 @@
import com.matrix.system.hive.action.util.QueryUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.PathVariable;
@@ -55,6 +55,10 @@
@Controller
@RequestMapping(value = "admin")
public class AdminAction extends BaseAction {
+
+
+ @Value("${default_password}")
+ String defaultPassword;
@Autowired
private SysUsersService sysUsersService;
@@ -306,7 +310,7 @@
LogUtil.info("#{}进行重置{}的密码操作#", loginUser.getSuAccount(), user.getSuAccount());
- user.setSuPassword(PropertiesUtil.getString(AppConstance.DEFAULT_PASSWORD));
+ user.setSuPassword(defaultPassword);
try {
// 设置加密后的密码
user.setSuPassword(PasswordUtil.getEncrypUserPwd(user));
@@ -450,6 +454,7 @@
AjaxResult all() {
SysUsers sysUsers = new SysUsers();
QueryUtil.setQueryLimit(sysUsers);
+ sysUsers.setSuValid(AppConstance.RECORD_VALID);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findInPage(sysUsers, null));
}
@@ -468,6 +473,16 @@
public @ResponseBody
AjaxResult shopAll() {
return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findByRoleName(true, null));
+ }
+
+
+ /**
+ * 查询所有员工
+ */
+ @RequestMapping(value = "/allUser")
+ public @ResponseBody
+ AjaxResult allUser() {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findByRoleName(false, null));
}
@@ -499,6 +514,7 @@
orderSheet.setHeaders(header);
SysUsers loginUser = getSessionUser();
shopStaffInfo.setShopId(loginUser.getShopId());
+ shopStaffInfo.setSuValid(AppConstance.RECORD_VALID);
List<SysUsers> dataList = sysUsersService.findInPage(shopStaffInfo, null);
List<List<Object>> list = new ArrayList<>();
if (dataList.size() > 0) {
--
Gitblit v1.9.1