From 1a3801b7316b0a23b6d3924eb4fbb023b1edef83 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 10:30:14 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 237c92c..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";
     }
@@ -222,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);

--
Gitblit v1.7.1