From c273bf2f4e425c14ff9bddbc4c3bf5b647622fd9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 09 Sep 2023 14:10:13 +0800
Subject: [PATCH] 成绩导出，系统使用有效期修改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 128f206..87a24bc 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -21,6 +21,7 @@
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
@@ -357,10 +358,8 @@
 	/**
 	 * 导入保安员test
 	 * @param data
-	 * @param isCovered
-	 * @param deptId
 	 */
-	void importSecurityTest(List<SecurityExcel> data, Boolean isCovered, String deptId);
+	void importSecurityTest(List<SecurityExcel> data);
 	/**
 	 * 查询押运人员编码不为null的保安信息
 	 * @return
@@ -374,4 +373,25 @@
 	 */
 	Object getAgeStatistics(UserVO user);
 
+	/**
+	 * 查询登录密码还是 123456 的单位信息
+	 * @return
+	 */
+    Object getNotUpdatePwdInfo();
+
+	/**
+	 * 根据用户 id 查询用户信息
+	 * @param id
+	 * @return
+	 */
+	User getUserById(String id);
+
+	/**
+	 * 获取用户信息
+	 * @param tenantId
+	 * @param phone
+	 * @param web
+	 * @return
+	 */
+	UserInfo userInfoByWx(String tenantId, String phone, UserEnum web);
 }

--
Gitblit v1.9.3