From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
index f71e030..8264879 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -1,11 +1,15 @@
package com.ruoyi.system.service.sys;
-import java.util.List;
-
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
+import com.ruoyi.system.api.domain.dto.MgtUserIdByDept;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
+import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo;
+import com.ruoyi.system.domain.dto.UserMenuEditDto;
+
+import java.util.List;
/**
* 用户 业务层
@@ -26,7 +30,7 @@
* 通过电话号码查询用户
*
*/
- public SysUser selectUserByPhoneNumber(String phonenumber);
+ public SysUser selectUserByPhoneNumber(String phonenumber,String userType);
/**
* 根据条件分页查询已分配用户角色列表
@@ -128,7 +132,14 @@
* @param user 用户信息
* @return 结果
*/
- public boolean registerUser(SysUser user);
+ public SysUser registerUser(SysUser user);
+
+ /**
+ *
+ * @param mobile
+ * @return
+ */
+ SysUser getSysUserByMobile(String mobile);
/**
* 修改用户信息
@@ -228,4 +239,56 @@
* @param appEditUserDto
*/
public void editUserInfo(AppEditUserDto appEditUserDto);
+
+ /**
+ * @description 获取部门用户
+ * @author jqs
+ * @date 2023/6/21 16:00
+ * @param userIdByDept
+ * @return MgtUserIdByDept
+ */
+ MgtUserIdByDept getUserIdByDept(MgtUserIdByDept userIdByDept);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/25 14:36
+ * @param mgtBaseBathDto
+ * @return List<MgtSysSimpleUserVo>
+ */
+ List<MgtSysSimpleUserVo> listSimpleUserVo(MgtBaseBathDto mgtBaseBathDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/25 16:37
+ * @param userMenuEditDto
+ * @return void
+ */
+ void editUserMenu(UserMenuEditDto userMenuEditDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/26 10:36
+ * @param sysUser
+ * @return void
+ */
+ void updateOnlyUser(SysUser sysUser);
+
+ /**
+ * @description 冻结用户
+ * @author jqs
+ * @date 2023/7/5 21:24
+ * @param mgtFrozenMemberDto
+ * @return void
+ */
+ void frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto);
+
+
+ /**
+ * 获取当前用户权限范围内的员工id
+ * @return
+ */
+ List<Long> getScopeOfAuthorityUserId();
}
--
Gitblit v1.7.1