From eac1bb48ce6df55a923981a99c26693406f877e9 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期二, 25 七月 2023 21:56:42 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index d7c5674..2962620 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller.sys;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -11,12 +12,18 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
import com.ruoyi.system.api.domain.poji.sys.SysDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.QwH5LoginVo;
+import com.ruoyi.system.api.model.QwUserDetailDto;
import com.ruoyi.system.domain.dto.UserMenuEditDto;
+import com.ruoyi.system.domain.pojo.staff.SysStaff;
+import com.ruoyi.system.service.staff.SysStaffService;
import com.ruoyi.system.service.sys.*;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
@@ -27,8 +34,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -59,22 +66,26 @@
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private SysStaffService sysStaffService;
+
/**
* 根据部门获取所有员工id
- * @param deptId
+ * @param userId
* @return
*/
- @GetMapping("/dept/{deptId}")
- public R<List<Long>> getUserIds(@PathVariable("deptId") Long deptId)
+ @GetMapping("/getUserIdsByDept/{userId}")
+ public R<List<Long>> getUserIdsByDept(@PathVariable("userId") Long userId)
{
- SysUser sysUser = new SysUser();
- sysUser.setDeptId(deptId);
- List<SysUser> userList = userService.selectUserList(sysUser);
- List<Long> userIds = new ArrayList<>();
- for (int i = 0; i < userList.size(); i++) {
- userIds.add(userList.get(i).getUserId());
- }
+ SysUser loginSysUser = userService.selectUserById(userId);
+ SysUser querySysUser = new SysUser();
+ querySysUser.setDelFlag("0");
+ querySysUser.setDeptId(loginSysUser.getDeptId());
+ List<SysUser> userList = userService.selectUserList(querySysUser);
+ List<Long> userIds = userList.stream().map(sysUser->{
+ return sysUser.getUserId();
+ }).collect(Collectors.toList());
return R.ok(userIds);
}
@@ -407,13 +418,39 @@
* @description 冻结用户
* @author jqs
* @date 2023/6/29 17:20
- * @param userId
+ * @param mgtFrozenMemberDto
* @return R<Activeness>
*/
@PostMapping("/frozenUser")
- public R frozenUser(@RequestBody Long userId)
+ public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto)
{
- userService.frozenUser(userId);
+ userService.frozenUser(mgtFrozenMemberDto);
return R.ok();
}
+
+ /**
+ * @description 员工端登录
+ * @author jqs
+ * @date 2023/7/14 10:04
+ * @param qwUserDetail
+ * @return R<QwH5LoginVo>
+ */
+ @PostMapping("/qwH5StaffLogin")
+ public R<QwH5LoginVo> qwH5StaffLogin(@RequestBody QwUserDetailDto qwUserDetail)
+ {
+ String mobile = qwUserDetail.getMobile();
+ SysStaff sysStaff = sysStaffService.getByMobile(mobile);
+ if(sysStaff==null){
+ throw new ServiceException(AppErrorConstant.USER_NO_SYSTEM);
+ }
+ Long userId = sysStaff.getUserId();
+ SysUser sysUser = userService.selectUserById(userId);
+ Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
+ // 构造登录返回信息
+ QwH5LoginVo qwH5LoginVo = new QwH5LoginVo();
+ qwH5LoginVo.setUserid(qwUserDetail.getUserid());
+ qwH5LoginVo.setMobile(qwUserDetail.getMobile());
+ qwH5LoginVo.setSysUser(sysUser);
+ return R.ok(qwH5LoginVo);
+ }
}
--
Gitblit v1.7.1