From 51542c2d2272cfe19db8e7dbc07cccc1c448d22a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 20 九月 2024 15:17: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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 865899f..38889a2 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
@@ -1,13 +1,11 @@
package com.vci.frameworkcore.compatibility;
+import com.vci.dto.SmUserDTO;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.Collection;
import java.util.List;
@@ -162,6 +160,15 @@
*/
List<Tree> refTreeUsers(TreeQueryObject treeQueryObject) throws VciBaseException;
+ /***
+ * 浜哄憳鏉冮檺閫夋嫨鏍�
+ * @param treeQueryObject
+ * @return
+ * @throws VciBaseException
+ */
+ List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) throws VciBaseException;
+
+
/**
* 鏍￠獙瀵嗙爜鏄惁鐩稿悓锛屽湪鏂板钩鍙颁腑瀛樺偍鐨勫瘑鐮佹槸涓ゆmd5
* @param userOid 鐢ㄦ埛涓婚敭
@@ -193,10 +200,11 @@
/**
* 淇敼瀵嗙爜
* @param userOid 鐢ㄦ埛涓婚敭
+ * @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
- void changePassword(String userOid, String password, String confirmPassword) throws VciBaseException;
+ boolean changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws Exception;
/**
* 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�
--
Gitblit v1.9.3