From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 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-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
similarity index 90%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
index 5741c4f..8f653e9 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-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
@@ -1,7 +1,7 @@
-package com.vci.frameworkcore.compatibility;
+package com.vci.web.service;
 
-import com.vci.dto.SmUserDTO;
 import com.vci.corba.common.PLException;
+import com.vci.dto.SmUserDTO;
 import com.vci.pagemodel.SmUserVO;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
@@ -34,7 +34,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞★紝濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄥ垯杩斿洖null锛屼笉浼氭姏鍑哄紓甯�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    SmUserVO getUserByUserId(String userId) throws VciBaseException;
+    SmUserVO getUserByUserId(String userId);
 
     /**
      * 鎵归噺鑾峰彇鐢ㄦ埛鐨勪俊鎭紙鏍规嵁鐢ㄦ埛鍚嶏級
@@ -42,7 +42,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞★紝濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄥ垯杩斿洖绌虹殑鍒楄〃锛屼笉浼氭姏鍑哄紓甯�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserByUserIds(Collection<String> userIdCollections) throws VciBaseException;
+    List<SmUserVO> listUserByUserIds(Collection<String> userIdCollections);
 
     /**
      * 鏍规嵁鐢ㄦ埛涓婚敭鑾峰彇鐢ㄦ埛鐨勪俊鎭�
@@ -50,7 +50,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞★紝濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄥ垯杩斿洖null锛屼笉浼氭姏鍑哄紓甯�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    SmUserVO getUserByUserOid(String userOid) throws VciBaseException;
+    SmUserVO getUserByUserOid(String userOid);
 
     /**
      * 鎵归噺鑾峰彇鐢ㄦ埛鐨勪俊鎭� 锛堟牴鎹敤鎴蜂富閿級
@@ -58,7 +58,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞★紝濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄥ垯杩斿洖绌虹殑鍒楄〃锛屼笉浼氭姏鍑哄紓甯�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserByUserOids(Collection<String> userOidCollections) throws VciBaseException;
+    List<SmUserVO> listUserByUserOids(Collection<String> userOidCollections);
 
     /**
      * 鐢ㄦ埛绠$悊鐣岄潰鍒嗛〉鏌ヨ
@@ -66,7 +66,7 @@
      * @param pageHelper 鍒嗛〉鍙傛暟
      * @return
      */
-    DataGrid<SmUserVO> getDataGridUsers(Map<String, String> conditionMap, PageHelper pageHelper) throws PLException;
+    DataGrid<SmUserVO> getDataGridUsers(Map<String, String> conditionMap, PageHelper pageHelper);
 
     /**
      * 鏍规嵁鐢ㄦ埛鍚嶈幏鍙栫敤鎴风殑濮撳悕
@@ -88,7 +88,7 @@
      * @return 閮ㄩ棬涓婚敭鍜屽搴旂殑鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鐨勬槧灏勶紝key閮ㄩ棬鐨勪富閿紝value鏄繖涓儴闂ㄤ笅鐨勭敤鎴�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    Map<String,List<SmUserVO>> batchListUserByDeptOids(Collection<String> deptOidCollection) throws VciBaseException;
+    Map<String,List<SmUserVO>> batchListUserByDeptOids(Collection<String> deptOidCollection);
 
     /**
      * 缁熻閮ㄩ棬涓嬬殑鐢ㄦ埛锛氬寘鍚瓙閮ㄩ棬涓嬬殑鐢ㄦ埛
@@ -97,7 +97,7 @@
      * @return
      * @throws VciBaseException
      */
-    List<SmUserVO> countSmUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException;
+    List<SmUserVO> countSmUserByDeptOid(String deptOid, Map<String, String> queryMap);
 
     /**
      * 鏌ヨ鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄
@@ -106,7 +106,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException;
+    List<SmUserVO> listUserByDeptOid(String deptOid, Map<String, String> queryMap);
 
     /**
      * 鏌ヨ涓嶅湪鏌愪釜閮ㄩ棬涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
@@ -115,7 +115,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserUnInDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException;
+    List<SmUserVO> listUserUnInDeptOid(String deptOid, Map<String, String> queryMap);
 
     /**
      *  鏌ヨ鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
@@ -124,7 +124,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserByRoleOid(String roleOid, Map<String, String> queryMap) throws VciBaseException;
+    List<SmUserVO> listUserByRoleOid(String roleOid, Map<String, String> queryMap);
 
     /**
      * 鏌ヨ涓嶅湪鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛瀵硅薄鍒楄〃
@@ -133,7 +133,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞″垪琛紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    List<SmUserVO> listUserUnInRoleOid(String roleOid, Map<String, String> queryMap) throws VciBaseException;
+    List<SmUserVO> listUserUnInRoleOid(String roleOid, Map<String, String> queryMap);
 
     /**
      * 鎵归噺鏍规嵁瑙掕壊鐨勪富閿幏鍙栫敤鎴�
@@ -141,7 +141,7 @@
      * @return 瑙掕壊涓婚敭鍜屽搴旂殑鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鐨勬槧灏勶紝key瑙掕壊鐨勪富閿紝value鏄繖涓鑹蹭笅鐨勭敤鎴�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    Map<String,List<SmUserVO>> batchListUserByRoleOids(Collection<String> roleOidCollection) throws VciBaseException;
+    Map<String,List<SmUserVO>> batchListUserByRoleOids(Collection<String> roleOidCollection);
 
     /**
      * 鍙傜収鐢熸晥鐨勭敤鎴�
@@ -150,7 +150,7 @@
      * @return 鐢ㄦ埛鐨勬樉绀哄璞★紝榛樿浣跨敤鐢ㄦ埛鍚嶅崌搴忔帓鍒�
      * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    DataGrid<SmUserVO> refGridUsers(Map<String, String> queryMap, PageHelper pageHelper) throws VciBaseException;
+    DataGrid<SmUserVO> refGridUsers(Map<String, String> queryMap, PageHelper pageHelper);
 
     /**
      * 鍙傜収鐢ㄦ埛鐨勬爲褰㈡樉绀�
@@ -158,7 +158,7 @@
      * @return 鐢ㄦ埛鐨勬爲褰俊鎭紝閲岄潰浼氬寘鍚敤鎴峰璞¢噷鐨勬墍鏈夊睘鎬�
      * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    List<Tree> refTreeUsers(TreeQueryObject treeQueryObject) throws VciBaseException;
+    List<Tree> refTreeUsers(TreeQueryObject treeQueryObject);
 
     /**
      * 浜哄憳鏉冮檺閫夋嫨鏍�
@@ -166,7 +166,7 @@
      * @return
      * @throws VciBaseException
      */
-    List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) throws VciBaseException;
+    List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject);
 
     /**
      * 鏍¢獙瀵嗙爜鏄惁鐩稿悓锛屽湪鏂板钩鍙颁腑瀛樺偍鐨勫瘑鐮佹槸涓ゆmd5
@@ -211,14 +211,14 @@
      * @param wrongCount 瀵嗙爜鐨勯敊璇鏁�
      * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呭瓨鍌ㄥ埌鏁版嵁搴撲腑鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    void updateUserPwdWrongCount(String userOid, int wrongCount) throws VciBaseException;
+    void updateUserPwdWrongCount(String userOid, int wrongCount);
 
     /**
      * 鏇存柊鐢ㄦ埛鐨勬渶鍚庣櫥褰曟椂闂�
      * @param userOid 鐢ㄦ埛鐨勪富閿�
      * @throws VciBaseException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    void updateUserLoginTime(String userOid) throws VciBaseException;
+    void updateUserLoginTime(String userOid);
 
     /**
      * 娣诲姞鐢ㄦ埛
@@ -269,7 +269,7 @@
      * @param roleType
      * @return
      */
-    List<String> queryUserNameByRoleType(String roleType) throws PLException;
+    List<String> queryUserNameByRoleType(String roleType);
 
     /**
      * 浣跨敤褰撳墠鐢ㄦ埛鐨勭被鍨嬫煡璇㈢敤鎴�

--
Gitblit v1.9.3