From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 18:57:58 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index ee71eca..0664128 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.system;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
@@ -78,6 +79,13 @@
@RequestMapping("/user_add")
public String addView(Model model) {
model.addAttribute("language",UserExt.getLanguage());
+ LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(UserExt.getUser().getObjectType()!=1){
+ roleLambdaQueryWrapper.eq(Role::getObjId,UserExt.getUser().getObjectId());
+ }
+ roleLambdaQueryWrapper.eq(Role::getObjType,UserExt.getUser().getObjectType());
+ List<Role> list = roleService.list(roleLambdaQueryWrapper);
+ model.addAttribute("list",list);
return PREFIX + "user_add.html";
}
@@ -112,6 +120,13 @@
model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
LogObjectHolder.me().set(user);
+ LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(UserExt.getUser().getObjectType()!=1){
+ roleLambdaQueryWrapper.eq(Role::getObjId,UserExt.getUser().getObjectId());
+ }
+ roleLambdaQueryWrapper.eq(Role::getObjType,UserExt.getUser().getObjectType());
+ List<Role> list = roleService.list(roleLambdaQueryWrapper);
+ model.addAttribute("list",list);
model.addAttribute("language",UserExt.getLanguage());
return PREFIX + "user_edit.html";
}
@@ -205,8 +220,13 @@
// 判断账号是否重复
//Check if the account is duplicated
- User theUser = userService.getByAccount(user.getAccount());
- if (theUser != null) {
+ User theUser = new User();
+ if (user.getAccount()!=""){
+ theUser = userService.getByAccount(user.getAccount());
+
+ }
+ System.out.println("=====theUser======="+theUser);
+ if (theUser != null&&user.getAccount()!="") {
throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
}
@@ -217,6 +237,11 @@
user.setCreatetime(new Date());
User objectUser = UserFactory.createUser(user);
+ objectUser.setObjectType(UserExt.getUser().getObjectType());
+ objectUser.setObjectId(UserExt.getUser().getObjectId());
+ objectUser.setRoleid(user.getRoleid());
+ objectUser.setAccount(user.getPhone());
+ objectUser.setPassword(SecureUtil.md5("a123456"));
//查找平台所属公司
//Search for the company that owns the platform.
this.userService.save(objectUser);
@@ -379,7 +404,25 @@
*/
@RequestMapping(method = RequestMethod.POST, path = "/uploadImg")
@ResponseBody
- public ResultUtil uploadImg(@RequestPart("file") MultipartFile picture, HttpServletResponse response) {
+ public String uploadImg(@RequestPart("file") MultipartFile picture) {
+ String pictureName = "";
+ try {
+ pictureName = OssUploadUtil.ossUpload("img/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return pictureName;
+ }
+
+ /**
+ * 上传图片
+ */
+ /**
+ * 上传图片Amis
+ */
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadImgAmis")
+ @ResponseBody
+ public ResultUtil uploadImgAmis(@RequestPart("file") MultipartFile picture, HttpServletResponse response) {
String value = "";
try {
value = OssUploadUtil.ossUpload("img/", picture);
@@ -395,6 +438,7 @@
+
@RequestMapping(method = RequestMethod.POST, path = "/uploadFile")
@ResponseBody
public String uploadFile(@RequestPart("file") MultipartFile picture) {
--
Gitblit v1.7.1