From f905f4377db462640a4fdd53dc5daa1adfc8c542 Mon Sep 17 00:00:00 2001 From: zhaowenyu <35589726@qq.com> Date: Tue, 14 Oct 2025 18:30:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java similarity index 95% rename from ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java index 9ffff75..50a9e49 100644 --- a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java +++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java @@ -1,10 +1,12 @@ -package com.ard.system.service.impl; +package com.ard.system.service.system.impl; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + +import com.ard.system.service.system.ISysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,14 +18,13 @@ import com.ard.common.utils.SecurityUtils; import com.ard.common.utils.StringUtils; import com.ard.common.utils.spring.SpringUtils; -import com.ard.system.domain.SysRoleDept; -import com.ard.system.domain.SysRoleMenu; -import com.ard.system.domain.SysUserRole; -import com.ard.system.mapper.SysRoleDeptMapper; -import com.ard.system.mapper.SysRoleMapper; -import com.ard.system.mapper.SysRoleMenuMapper; -import com.ard.system.mapper.SysUserRoleMapper; -import com.ard.system.service.ISysRoleService; +import com.ard.system.domain.system.SysRoleDept; +import com.ard.system.domain.system.SysRoleMenu; +import com.ard.system.domain.system.SysUserRole; +import com.ard.system.mapper.system.SysRoleDeptMapper; +import com.ard.system.mapper.system.SysRoleMapper; +import com.ard.system.mapper.system.SysRoleMenuMapper; +import com.ard.system.mapper.system.SysUserRoleMapper; /** * 角色 业务层处理 -- Gitblit v1.9.3