From d2008fc35a45ff00b0f37939a13b792ab12e8c6f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
index 139b5d8..47cb4ec 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
@@ -29,7 +29,7 @@
boolean checkUserExist(String userName,String oid) throws PLException;
/**
- * 鏍规嵁鐢ㄦ埛鍚嶈幏鍙栫敤鎴风殑瀵硅薄锛屼笉鍖哄垎澶у皬鍐�
+ * 鏍规嵁鐢ㄦ埛鍚嶈幏鍙栫敤鎴风殑瀵硅薄锛屼笉鍖哄垎澶у皬鍐�
* @param userId 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛鐨勬樉绀哄璞★紝濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄥ垯杩斿洖null锛屼笉浼氭姏鍑哄紓甯�
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
@@ -161,6 +161,14 @@
List<Tree> refTreeUsers(TreeQueryObject treeQueryObject) throws VciBaseException;
/**
+ * 浜哄憳鏉冮檺閫夋嫨鏍�
+ * @param treeQueryObject
+ * @return
+ * @throws VciBaseException
+ */
+ List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) throws VciBaseException;
+
+ /**
* 鏍￠獙瀵嗙爜鏄惁鐩稿悓锛屽湪鏂板钩鍙颁腑瀛樺偍鐨勫瘑鐮佹槸涓ゆmd5
* @param userOid 鐢ㄦ埛涓婚敭
* @param md5Password 宸茬粡md5鍔犲瘑涓�娆＄殑瀵嗙爜
@@ -190,12 +198,12 @@
/**
* 淇敼瀵嗙爜
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛涓婚敭
* @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
- boolean changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws Exception;
+ boolean changePassword(String userName,String oldPassword, String password, String confirmPassword) throws Exception;
/**
* 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�
@@ -256,4 +264,11 @@
*/
BaseResult importUser(File file) throws Exception;
+ /**
+ * 鏍规嵁瑙掕壊绫诲瀷鏌ヨ鐢ㄦ埛鍚�
+ * @param roleType
+ * @return
+ */
+ List<String> queryUserNameByRoleType(String roleType) throws PLException;
+
}
--
Gitblit v1.9.3