From 328b0158c3d97f87efc7da22a1e3f5a7c258b127 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 七月 2024 19:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
index 754f12a..bba3844 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
@@ -1,6 +1,7 @@
package com.vci.frameworkcore.compatibility;
import com.vci.corba.common.PLException;
+import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -26,6 +27,15 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
OrgDepartmentVO getDeptByDeptOid(String deptOid) throws VciBaseException;
+
+ /**
+ * 鏍规嵁鐖堕儴闂ㄤ富閿幏鍙栧拰閮ㄩ棬鍚嶇О閮ㄩ棬鐨勪俊鎭�
+ * @param parentDeptOid 鐖堕儴闂ㄤ富閿�
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @return 閮ㄩ棬鐨勬樉绀哄璞★紝濡傛灉閮ㄩ棬涓嶅瓨鍦ㄥ垯杩斿洖null锛屼笉浼氭姏鍑哄紓甯�
+ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
+ */
+ OrgDepartmentVO getDeptByDeptPOidAndCondition(String parentDeptOid,Map<String,String> conditionMap) throws VciBaseException;
/**
* 鎵归噺鑾峰彇閮ㄩ棬鐨勪俊鎭� 锛堟牴鎹儴闂ㄤ富閿級
@@ -93,7 +103,7 @@
List<OrgDepartmentVO> listChildrenDeptByParentOid(String pkFatherDepartmment, Map<String, String> queryMap);
/**
- * 鑾峰彇鏌愪釜閮ㄩ棬鐨勬墍鏈夋浘缁忕殑涓嬬骇閮ㄩ棬
+ * 鑾峰彇鏌愪釜閮ㄩ棬鐨勬墍鏈夊眰绾х殑涓嬬骇閮ㄩ棬
* @param pkFatherDepartmment 閮ㄩ棬鐨勪富閿�
* @param queryMap 鏌ヨ鏉′欢
* @return 閮ㄩ棬鏄剧ず瀵硅薄
@@ -115,11 +125,38 @@
DataGrid refTreeGridDept(TreeQueryObject treeQueryObject);
/**
- * 淇濆瓨閮ㄩ棬瑙掕壊鍏宠仈淇℃伅锛屽甫鏌ラ噸鍔熻兘
- * @param userId 鐢ㄦ埛id
- * @param deptIds 閮ㄩ棬oid
+ * 淇濆瓨閮ㄩ棬瑙掕壊鍏宠仈淇℃伅锛屽甫鏌ラ噸鍔熻兘锛屽瀵瑰淇濆瓨
+ * @param userOIds 鐢ㄦ埛id
+ * @param deptId 閮ㄩ棬oid
* @return
*/
- boolean saveUserDepts(String userId, List<String> deptIds) throws PLException;
+ boolean saveUsersDept(String[] userOIds, String deptId) throws PLException;
+
+ /**
+ * 澧炲姞閮ㄩ棬淇℃伅
+ * @param orgDepartmentDTO
+ * @return
+ */
+ boolean addDept(OrgDepartmentDTO orgDepartmentDTO) throws PLException;
+
+ /**
+ * 淇敼閮ㄩ棬淇℃伅
+ * @param orgDepartmentDTO
+ * @return
+ */
+ boolean updateDept(OrgDepartmentDTO orgDepartmentDTO) throws PLException;
+
+ /**
+ * 鍒犻櫎閮ㄩ棬
+ * @param ids
+ * @return
+ */
+ boolean deleteDept(String[] ids) throws PLException;
+
+ /**
+ * 鑾峰彇鎵�鏈夐儴闂ㄧ殑淇℃伅
+ * @return key锛氶儴闂ㄧ敱鍚嶇О缁勬垚鐨勮矾寰勶紙/闂撮殧锛夛紝value瀵瑰簲鏈�灏忓眰绾х殑閮ㄩ棬淇℃伅
+ */
+ Map<String,OrgDepartmentVO> getDeptAllTreeMap();
}
--
Gitblit v1.9.3