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 | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 26 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 f288fd7..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
@@ -12,24 +12,26 @@
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.poji.config.SysTag;
+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.AppMiniLoginVo;
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.service.config.SysTagService;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -64,7 +66,28 @@
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private SysStaffService sysStaffService;
+
+ /**
+ * 根据部门获取所有员工id
+ * @param userId
+ * @return
+ */
+ @GetMapping("/getUserIdsByDept/{userId}")
+ public R<List<Long>> getUserIdsByDept(@PathVariable("userId") Long userId)
+ {
+ 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);
+ }
/**
* 获取用户列表
@@ -149,25 +172,7 @@
return R.ok(userService.registerUser(sysUser)!=null);
}
- /**
- * 企业微信H5登录
- * @param qwUserDetail
- * @return
- */
- @PostMapping("/qwH5Login")
- public R<QwH5LoginVo> qwH5Login(@RequestBody QwUserDetailDto qwUserDetail)
- {
- String mobile = qwUserDetail.getMobile();
- SysUser sysUser = userService.selectUserByPhoneNumber(mobile);
- 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);
- }
/**
@@ -352,10 +357,11 @@
* @date 2023/4/30 15:36
* @version 1.0
*/
- @InnerAuth
@PostMapping("/getSysUser")
public R<SysUser> getSysUser(@RequestBody Long userId){
+ logger.info("userId"+userId);
SysUser sysUser = userService.selectUserById(userId);
+ logger.info("sysUser"+sysUser.toString());
return R.ok(sysUser);
}
@@ -371,7 +377,11 @@
return R.ok(sysUser);
}
-
+ @PostMapping("/getSysUserByMobile")
+ public R<SysUser> getSysUserByMobile(@RequestBody String mobile){
+ SysUser sysUser = userService.getSysUserByMobile(mobile);
+ return R.ok(sysUser);
+ }
/**
* @description: 更新用户手机
@@ -379,7 +389,6 @@
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
@PostMapping("/updateUserMobile")
public R updateUserMobile(@RequestBody SysUser sysUser){
userService.updateUserMobile(sysUser);
@@ -391,11 +400,57 @@
* @param appEditUserDto
* @return
*/
- @InnerAuth
@PostMapping("/editUserInfo")
public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
userService.editUserInfo(appEditUserDto);
return R.ok();
}
+ @ApiOperation(value = "修改用户权限")
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE,operContent = "修改用户权限")
+ @PostMapping("/editUserMenu")
+ public R editUserMenu(@RequestBody UserMenuEditDto userMenuEditDto){
+ userService.editUserMenu(userMenuEditDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 冻结用户
+ * @author jqs
+ * @date 2023/6/29 17:20
+ * @param mgtFrozenMemberDto
+ * @return R<Activeness>
+ */
+ @PostMapping("/frozenUser")
+ public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto)
+ {
+ 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