From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 0b38d90..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;
@@ -25,11 +24,10 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.SysVipInfo;
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;
@@ -45,11 +43,8 @@
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-
-import static com.matrix.system.common.constance.AppConstance.SAFEPATH;
/**
* @author 姜ø友瑶
@@ -60,6 +55,10 @@
@Controller
@RequestMapping(value = "admin")
public class AdminAction extends BaseAction {
+
+
+ @Value("${default_password}")
+ String defaultPassword;
@Autowired
private SysUsersService sysUsersService;
@@ -311,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));
@@ -435,6 +434,15 @@
return result;
}
+ @RequestMapping(value = "/getUserById")
+ public @ResponseBody
+ AjaxResult getUserById(Long id) {
+ AjaxResult result = AjaxResult.buildSuccessInstance("");
+ SysUsers user = sysUsersService.findById(id);
+ result.putInMap("user", user);
+ return result;
+ }
+
/**
* 条件查询所有员工，不分页
@@ -446,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 +477,16 @@
/**
+ * 查询所有员工
+ */
+ @RequestMapping(value = "/allUser")
+ public @ResponseBody
+ AjaxResult allUser() {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findByRoleName(false, null));
+ }
+
+
+ /**
* 根据角色名称查询店铺的员工
*/
@RequestMapping(value = "/getShopStaffByRoleName")
@@ -477,23 +496,6 @@
}
- /**
- * 查询历史搜索人数
- *
- * @return
- * @author luoyuanhong
- */
- @SuppressWarnings("unchecked")
- @RequestMapping(value = "/showHistoryUser")
- public @ResponseBody
- AjaxResult showHistoryUser() {
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) != null) {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS,
- (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER), 0);
- } else {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, null, 0);
- }
- }
/**
@@ -512,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