From 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 16:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index c5018bc..18e0053 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -6,6 +6,7 @@
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.BeauticianDto;
+import com.matrix.system.app.dto.PwdModifyDto;
import com.matrix.system.app.dto.UsersQueryDto;
import com.matrix.system.app.mapper.SysBeauticianStateMapper;
import com.matrix.system.app.mapper.SysUsersMapper;
@@ -14,6 +15,9 @@
import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.common.tools.PasswordUtil;
+import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.service.AchieveNewService;
@@ -28,6 +32,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +44,7 @@
@Api(value = "ApiUsersAction", tags = "用户中心接口类")
@RestController
@RequestMapping(value = "/api/user")
-public class ApiUsersAction {
+public class ApiUsersAction extends BaseController {
@Autowired
private AchieveNewService achieveNewService;
@@ -114,12 +120,38 @@
SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
SysUsers query = new SysUsers();
- query.setCompanyId(sysUsers.getCompanyId());
- query.setShopId(sysUsers.getShopId());
+ if (DataAuthUtil.hasAllShopAuth()) {
+ query.setCompanyId(sysUsers.getCompanyId());
+ } else {
+ query.setCompanyId(sysUsers.getCompanyId());
+ query.setShopId(sysUsers.getShopId());
+ }
query.setSuName(usersQueryDto.getQueryKey());
List<SysUsers> list = sysUsersService.findByModel(query);
List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list);
return AjaxResult.buildSuccessInstance(dataList);
}
+ @ApiOperation(value = "修改密码", notes = "修改密码")
+ @PostMapping(value = "/modifyPwd")
+ public AjaxResult modifyPwd(@RequestBody @Validated PwdModifyDto pwdModifyDto) throws UnsupportedEncodingException, NoSuchAlgorithmException {
+ SysUsers me = getMe();
+ SysUsers user = sysUsersService.findById(me.getSuId());
+
+ SysUsers pwdUser = new SysUsers();
+ pwdUser.setSuPassword(pwdModifyDto.getOldPwd());
+ pwdUser.setSuRegisterTime(user.getSuRegisterTime());
+ String pwd = PasswordUtil.getEncrypUserPwd(pwdUser);
+ if (!pwd.equals(user.getSuPassword())) {
+ return AjaxResult.buildFailInstance("老密码错误");
+ }
+
+ int i = sysUsersService.updateUserPassword(user.getSuId(), pwd);
+ if (i > 0) {
+ return AjaxResult.buildSuccessInstance("修改成功");
+ }
+ return AjaxResult.buildFailInstance("修改失败");
+
+ }
+
}
--
Gitblit v1.9.1