From 648755a252f65598a554bdb0fdbdd961a72838c2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 14:14:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index b20e4bd..b6ba3d3 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -872,6 +872,11 @@
}
String city = str.substring(Constants.ZERO, str.length() - 1);
franchisee.setCity(city);
+ List<SysUser> list1 = sysUserService.lambdaQuery().eq(SysUser::getAccount, franchisee.getAdminAccount())
+ .eq(SysUser::getIsEnable, 1).eq(SysUser::getIsDelete, 0).list();
+ if(!list1.isEmpty()){
+ return R.passwordError("该管理员账号已存在！");
+ }
boolean save = franchiseeService.save(franchisee);
// 生成sysUser账号
SysUser sysUser = new SysUser();
--
Gitblit v1.7.1