修改查询部门接口

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

@@ -58,11 +58,16 @@ public class DinasCommonController {
 		} else {
 			String departmentId = param.getString("id");
 			Boolean enable = param.getBoolean("enable");
+			String type = param.optString("type", "REGIONAL_COMPANY");
+			if(type.equals("REGIONAL_COMPANY")) {
 				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);
+			} else if(type.equals("GROUP_COMPANY")) {
+				list.addAll(departmentService.getAllEnable());
+			}
 		}
 		Map<UUID, String> deptTitlePath = departmentService.getTitlePath(list);
 		List<Map<String, Object>> result = deptAddTitlePathProperty(list, deptTitlePath);