From 7a9e05846c5e37f7278f242857056d0623532379 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 六月 2023 20:17:32 +0800
Subject: [PATCH] 修改bug和功能优化
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java | 49 +++----------------------------------------------
1 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
index 65d89a1..ff7214b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -251,11 +251,9 @@
user.setCreatetime(new Date());
User objectUser = UserFactory.createUser(user);
- //查找平台所属公司
- TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).orderBy("id", true).last(" limit 1"));
- if (SinataUtil.isNotEmpty(company)){
- objectUser.setObjectId(company.getId());
- }
+ ShiroUser user1 = ShiroKit.getUser();
+ objectUser.setRoleType(user1.getRoleType());
+ objectUser.setObjectId(user1.getObjectId());
objectUser.setPassWordUpdate(new Date());
this.userService.insert(objectUser);
@@ -347,9 +345,6 @@
return SUCCESS_TIP;
}
- @Autowired
- private ITCompanyService itCompanyService;
-
/**
* 冻结用户
*/
@@ -366,26 +361,6 @@
}
assertAuth(userId);
this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());
-
- User user = userService.selectById(userId);
- if (user.getRoleType() == 2){
- //查询分公司
- TCompany company = itCompanyService.selectById(user.getObjectId());
- company.setState(1);
- itCompanyService.updateById(company);
-
- //设置该分公司下的所有司机状态
-// itDriverService.updateCompanyDriverState(3,company.getId());
-
- }else if (user.getRoleType() == 3){
- //查询加盟商
- TCompany franchisee = itCompanyService.selectById(user.getObjectId());
- franchisee.setState(1);
- itCompanyService.updateById(franchisee);
-
- //设置该加盟商下的所有司机状态
-// itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
- }
return SUCCESS_TIP;
}
@@ -403,24 +378,6 @@
this.userService.setStatus(userId, ManagerStatus.OK.getCode());
User user = userService.selectById(userId);
- if (user.getRoleType() == 2){
- //查询分公司
- TCompany company = itCompanyService.selectById(user.getObjectId());
- company.setState(0);
- itCompanyService.updateById(company);
-
- //设置该分公司下的所有司机状态
-// itDriverService.updateCompanyDriverState(2,company.getId());
-
- }else if (user.getRoleType() == 3){
- //查询加盟商
- TCompany franchisee = itCompanyService.selectById(user.getObjectId());
- franchisee.setState(0);
- itCompanyService.updateById(franchisee);
-
- //设置该加盟商下的所有司机状态
-// itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
- }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1