From b4882b114f082e010d4cc3359d78d18095ef3b83 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:49:38 +0800
Subject: [PATCH] 商户端和管理台联调bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 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 694c53c..c516332 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,7 +1,6 @@
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;
@@ -13,27 +12,22 @@
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
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.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;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -63,8 +57,6 @@
@Autowired
private ISysConfigService configService;
-
-
/**
* 获取用户列表
@@ -149,25 +141,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);
- }
/**
@@ -368,11 +342,15 @@
*/
@PostMapping("/registerUser")
public R<SysUser> registerUser(@RequestBody SysUser sysUser){
- userService.registerUser(sysUser);
+ sysUser = userService.registerUser(sysUser);
return R.ok(sysUser);
}
-
+ @PostMapping("/getSysUserByMobile")
+ public R<SysUser> getSysUserByMobile(@RequestBody String mobile){
+ SysUser sysUser = userService.getSysUserByMobile(mobile);
+ return R.ok(sysUser);
+ }
/**
* @description: 更新用户手机
@@ -397,4 +375,10 @@
return R.ok();
}
+ @ApiOperation(value = "修改用户权限")
+ @PostMapping("/editUserMenu")
+ public R editUserMenu(@RequestBody UserMenuEditDto userMenuEditDto){
+ userService.editUserMenu(userMenuEditDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1