修改OA模块功能树，增加获取部门列表接口

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -823,6 +823,19 @@
 								</m:function-definition>
 								<m:icon>iconfont icon-qiyeshezhi</m:icon>
 							</m:function-node>
+							<m:function-node>
+								<m:id>bb8121b9-c0b0-4ebe-90ab-a56245134ef8</m:id>
+								<m:name>stamp_lend_record</m:name>
+								<m:title>证章借出备案</m:title>
+								<m:index>930</m:index>
+								<m:license></m:license>
+								<m:privilege></m:privilege>
+								<m:function-definition>
+									<m:view>function-stamp-lend-record</m:view>
+									<m:view-config></m:view-config>
+								</m:function-definition>
+								<m:icon>iconfont icon-qiyeshezhi</m:icon>
+							</m:function-node>
 						</m:children>
 					</m:function-node>
 					<m:function-node>
@@ -863,6 +876,19 @@
 								</m:function-definition>
 								<m:icon>iconfont icon-qiyeshezhi</m:icon>
 							</m:function-node>
+							<m:function-node>
+								<m:id>8617f315-93ec-4af8-92ce-075e41bd32e8</m:id>
+								<m:name>seal_record</m:name>
+								<m:title>用印备案</m:title>
+								<m:index>1300</m:index>
+								<m:license></m:license>
+								<m:privilege></m:privilege>
+								<m:function-definition>
+									<m:view>function-seal-record</m:view>
+									<m:view-config></m:view-config>
+								</m:function-definition>
+								<m:icon>iconfont icon-qiyeshezhi</m:icon>
+							</m:function-node>
 						</m:children>
 					</m:function-node>
 					<m:function-node>
@@ -943,6 +969,19 @@
 								</m:function-definition>
 								<m:icon>iconfont icon-qiyeshezhi</m:icon>
 							</m:function-node>
+							<m:function-node>
+								<m:id>b978f8e0-e10a-4207-8309-baca6c079909</m:id>
+								<m:name>business_trip_record</m:name>
+								<m:title>出差备案</m:title>
+								<m:index>2300</m:index>
+								<m:license></m:license>
+								<m:privilege></m:privilege>
+								<m:function-definition>
+									<m:view>function-business-trip-record</m:view>
+									<m:view-config></m:view-config>
+								</m:function-definition>
+								<m:icon>iconfont icon-qiyeshezhi</m:icon>
+							</m:function-node>
 						</m:children>
 					</m:function-node>
                     <m:function-node>
@@ -1011,6 +1050,19 @@
 								<m:icon>iconfont icon-qiyeshezhi</m:icon>
 							</m:function-node>
 							<m:function-node>
+								<m:id>2af192a1-1d3b-459d-a9e5-72636396fc35</m:id>
+								<m:name>performance_assess_approve</m:name>
+								<m:title>绩效考核审批</m:title>
+								<m:index>3300</m:index>
+								<m:license></m:license>
+								<m:privilege></m:privilege>
+								<m:function-definition>
+									<m:view>function-performance-assess-approve</m:view>
+									<m:view-config></m:view-config>
+								</m:function-definition>
+								<m:icon>iconfont icon-qiyeshezhi</m:icon>
+							</m:function-node>
+							<m:function-node>
 								<m:id>a56eb79b-7b3f-4920-95e5-21418693553c</m:id>
 								<m:name>performance_assess_staff</m:name>
 								<m:title>绩效考核打分</m:title>

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/CommonConfiguration.java

+package com.xyst.dinas.biz.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.xyst.dinas.biz.web.CommonController;
+
+@Configuration
+public class CommonConfiguration {
+
+	@Bean
+	public CommonController commonController() {
+		return new CommonController();
+	}
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasOrganizationDaoImpl.java

@@ -79,14 +79,14 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
 				String code = tuple.get(2, String.class);
 				String address = tuple.get(3, String.class);
 				String type = tuple.get(5, String.class);
-				UUID deparentId = tuple.get(4, UUID.class);
+				UUID departmentId = tuple.get(4, UUID.class);
 				Map<String, Object> map = new HashMap<>();
 				map.put("id", fid);
 				map.put("name", name);
 				map.put("code", code);
 				map.put("address", address);
 				map.put("type", type);
-				map.put("deparentId", deparentId);
+				map.put("departmentId", departmentId);
 				result.add(map);
 			}
 			

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/CommonController.java

+package com.xyst.dinas.biz.web;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.beecode.bap.department.service.DepartmentService;
+import com.beecode.bcp.type.KObject;
+
+@RestController
+public class CommonController {
+	
+	@Autowired
+	public DepartmentService departmentService;
+
+	/**  
+	 * @Description: 根据部门id查询全公司及其该部门的子部门（包括该部门自身）
+	 * @param id
+	 * @return return_type
+	 * @throws   
+	 */
+	@ResponseBody
+    @RequestMapping(value = "/dinasBiz/department/queryDepartmentById", method = RequestMethod.POST)
+    public List<KObject> queryDepartmentById(@RequestBody String body) {
+		JSONObject param = new JSONObject(body);
+		List<KObject> list = new ArrayList<KObject>();
+		if(param.isNull("id")) {
+			KObject rootLevel = departmentService.getByCode("quangongsi");
+			list.add(rootLevel);
+		} else {
+			String departmentId = param.getString("id");
+			Boolean enable = param.getBoolean("enable");
+			KObject rootLevel = departmentService.getByCode("quangongsi");
+			KObject regionalLevel = departmentService.getById(UUID.fromString(departmentId));
+			list.addAll(departmentService.getChildren(UUID.fromString(departmentId), enable));
+			list.add(rootLevel);
+			list.add(regionalLevel);
+		}
+		
+		return list;
+    }
+}

backend/xyst.dinas.biz/src/main/resources/META-INF/spring.factories

@@ -5,4 +5,5 @@ com.xyst.dinas.biz.config.DinasTypeConfiguration,\
 com.xyst.dinas.biz.config.ShipConfiguration,\
 com.xyst.dinas.biz.config.SceneConfiguration,\
 com.xyst.dinas.biz.config.DinasOrganizationConfig,\
-com.xyst.dinas.biz.config.BizDataInitializerConfig
+com.xyst.dinas.biz.config.BizDataInitializerConfig,\
+com.xyst.dinas.biz.config.CommonConfiguration
\ No newline at end of file