From 1e4b4f686f4462786c75b9a9f2cd59f29d8b2140 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java |  147 +++++++++++++++++++++++-------------------------
 1 files changed, 70 insertions(+), 77 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
index 8a777ec..ab578b5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
@@ -11,85 +11,78 @@
 
 /**
  * 用户和角色关联Service业务层处理
- * 
+ *
  * @author xiaochen
  * @date 2023-06-12
  */
 @Service
-public class SysUserRoleServiceImpl  extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService
-{
-    @Autowired
-    private SysUserRoleMapper sysUserRoleMapper;
-
-    /**
-     * 查询用户和角色关联
-     * 
-     * @param userId 用户和角色关联主键
-     * @return 用户和角色关联
-     */
-    @Override
-    public SysUserRole selectSysUserRoleByUserId(Long userId)
-    {
-        return sysUserRoleMapper.selectSysUserRoleByUserId(userId);
-    }
-
-    /**
-     * 查询用户和角色关联列表
-     * 
-     * @param sysUserRole 用户和角色关联
-     * @return 用户和角色关联
-     */
-    @Override
-    public List<SysUserRole> selectSysUserRoleList(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.selectSysUserRoleList(sysUserRole);
-    }
-
-    /**
-     * 新增用户和角色关联
-     * 
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    @Override
-    public int insertSysUserRole(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.insertSysUserRole(sysUserRole);
-    }
-
-    /**
-     * 修改用户和角色关联
-     * 
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    @Override
-    public int updateSysUserRole(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.updateSysUserRole(sysUserRole);
-    }
-
-    /**
-     * 批量删除用户和角色关联
-     * 
-     * @param userIds 需要删除的用户和角色关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysUserRoleByUserIds(Long[] userIds)
-    {
-        return sysUserRoleMapper.deleteSysUserRoleByUserIds(userIds);
-    }
-
-    /**
-     * 删除用户和角色关联信息
-     * 
-     * @param userId 用户和角色关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysUserRoleByUserId(Long userId)
-    {
-        return sysUserRoleMapper.deleteSysUserRoleByUserId(userId);
-    }
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+	@Autowired
+	private SysUserRoleMapper sysUserRoleMapper;
+	
+	/**
+	 * 查询用户和角色关联
+	 *
+	 * @param userId 用户和角色关联主键
+	 * @return 用户和角色关联
+	 */
+	@Override
+	public SysUserRole selectSysUserRoleByUserId(Long userId) {
+		return sysUserRoleMapper.selectSysUserRoleByUserId(userId);
+	}
+	
+	/**
+	 * 查询用户和角色关联列表
+	 *
+	 * @param sysUserRole 用户和角色关联
+	 * @return 用户和角色关联
+	 */
+	@Override
+	public List<SysUserRole> selectSysUserRoleList(SysUserRole sysUserRole) {
+		return sysUserRoleMapper.selectSysUserRoleList(sysUserRole);
+	}
+	
+	/**
+	 * 新增用户和角色关联
+	 *
+	 * @param sysUserRole 用户和角色关联
+	 * @return 结果
+	 */
+	@Override
+	public int insertSysUserRole(SysUserRole sysUserRole) {
+		return sysUserRoleMapper.insertSysUserRole(sysUserRole);
+	}
+	
+	/**
+	 * 修改用户和角色关联
+	 *
+	 * @param sysUserRole 用户和角色关联
+	 * @return 结果
+	 */
+	@Override
+	public int updateSysUserRole(SysUserRole sysUserRole) {
+		return sysUserRoleMapper.updateSysUserRole(sysUserRole);
+	}
+	
+	/**
+	 * 批量删除用户和角色关联
+	 *
+	 * @param userIds 需要删除的用户和角色关联主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteSysUserRoleByUserIds(Long[] userIds) {
+		return sysUserRoleMapper.deleteSysUserRoleByUserIds(userIds);
+	}
+	
+	/**
+	 * 删除用户和角色关联信息
+	 *
+	 * @param userId 用户和角色关联主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteSysUserRoleByUserId(Long userId) {
+		return sysUserRoleMapper.deleteSysUserRoleByUserId(userId);
+	}
 }

--
Gitblit v1.7.1