From f07aabaf30a9a73f0da21c6b7ed31577d1f6f93f Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 05 一月 2026 11:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
index a16f786..4df9dd3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
@@ -118,6 +118,10 @@
public R<String> add(@RequestBody TCompany company) {
company.setStatus(1);
company.setCreateUserId(getUserId());
+ if(company.getAccount()!=null && "admin".equals(company.getAccount())){
+ return R.fail("账号不能为admin");
+ }
+
SysUser user = new SysUser();
user.setRoleType(2);
user.setDeptId(124l);
@@ -153,6 +157,9 @@
@PostMapping(value = "/edit")
@Log(title = "修改公司-修改", businessType = BusinessType.UPDATE)
public R<String> edit(@RequestBody TCompany company) {
+ if(company.getAccount()!=null && "admin".equals(company.getAccount())){
+ return R.fail("账号不能为admin");
+ }
SysUser user = userService.getUserByCompanyId(company.getId());
if (!userService.checkUserNameUnique(user)) {
return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -160,8 +167,9 @@
return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setUserName(company.getAccount());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword(company.getPassword()));
company.setUpdateUserId(getUserId());
+ user.setRoleId(2L);
int count = userService.updateUser(user);
if (count > 0) {
boolean update = companyService.updateById(company);
@@ -255,6 +263,9 @@
@PostMapping("/system/user/add")
public R<String> add(@RequestBody SysUser user)
{
+ if(user.getUserName()!=null && "admin".equals(user.getUserName())){
+ return R.fail("账号不能为admin");
+ }
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -303,6 +314,9 @@
@PostMapping("/system/user/edit")
public R edit(@RequestBody SysUser user)
{
+ if(user.getUserName()!=null && "admin".equals(user.getUserName())){
+ return R.fail("账号不能为admin");
+ }
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
@@ -318,6 +332,7 @@
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
+ user.setRoleId(2L);
// 移除之前的二维码
redisTemplate.delete("ADMIN_WX_IMG" + user.getUserId());
return R.ok(userService.updateUser(user));
--
Gitblit v1.7.1