From 117b79830ffdabfd3f31a104bf0dc9be915d3e06 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Fri, 12 Jul 2024 09:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9BTO?=
 =?UTF-8?q?DO=EF=BC=9A=E9=9C=80=E8=A6=81=E5=AE=9E=E7=8E=B0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/modules/auth/service/impl/SysMenuServiceImpl.java    | 2 ++
 .../com/das/modules/auth/service/impl/SysOrgServiceImpl.java | 5 +++++
 .../das/modules/auth/service/impl/SysUserServiceImpl.java    | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
index 8baf6ee4..7cf2c5a5 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
@@ -46,6 +46,8 @@ public class SysMenuServiceImpl implements SysMenuService {
 
     @Override
     public void deleteMenu(DeleteDto deleteDto) {
+        //TODO:删除菜单，需要判断菜单下是否有子菜单，有子菜单不能删除
+
         sysMenuMapper.deleteById(deleteDto.getId());
     }
 
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
index bf80c428..342a28f5 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
@@ -44,10 +44,15 @@ public class SysOrgServiceImpl implements SysOrgService {
 
     @Override
     public void deleteOrg(DeleteDto deleteDto) {
+        //TODO: 如果该机构是根机构，最好是不要删除，系统保留一个根机构
+
+        //TODO：机构下是否有子机构，如果有，不能删除
+
         // 根据机构id查询是否有用户
         if(sysOrgMapper.queryOrgUserCount(deleteDto.getId()) > 0) {
             throw new RuntimeException("该机构下有用户，不能删除");
         }
+
         sysOrgMapper.deleteById(deleteDto.getId());
     }
 
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
index 6990d0bc..4f3b241a 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
@@ -196,6 +196,8 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public void deleteUser(DeleteDto deleteDto) {
+        //TODO: 用户不能删除自己，避免删除后系统无法正常登录
+
         if (deleteDto.getId() ==null) {
             throw new ServiceException("参数缺失");
         }
@@ -208,7 +210,7 @@ public class SysUserServiceImpl implements SysUserService {
         QueryWrapper<SysUserRole> accountRoleQueryWrapper = new QueryWrapper<>();
         accountRoleQueryWrapper.eq("user_id", deleteDto.getId());
         this.sysUserRoleMapper.delete(accountRoleQueryWrapper);
-        //删除角色
+        //删除用户
         sysUserMapper.deleteById(deleteDto.getId());
     }