From 76ee35bdb45523375cfdc55d2aac87cc73d1a48f Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Thu, 11 Sep 2025 16:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeOrganzationController.java | 15 +++++++++++++++ .../service/AuthorizedStrengthService.java | 1 + .../organization/service/OrganaztionService.java | 6 ++++++ .../impl/AuthorizedStrengthServiceImpl.java | 1 + .../service/impl/OrganaztionSeviceImpl.java | 16 ++++++++++++++++ 5 files changed, 39 insertions(+) diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java index ebf6c4b..44e9c68 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java @@ -169,4 +169,19 @@ public class ChangeOrganzationController extends BaseCommonController { return WeaResult.success(resultMap); } + /** + * 获取同步部门token + * @return + */ + @WeaPermission(publicPermission = true) + @PostMapping("/getDepartmentTree") + @ResponseBody + public WeaResult>> getDepartmentTree(@RequestParam Map params){ + Gson gson = new Gson(); + log.error("*********getDepartmentTree********"); + log.error(gson.toJson(params)); + List> resultList = organaztionService.getDepartmentTree(params); + return WeaResult.success(resultList); + } + } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/AuthorizedStrengthService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/AuthorizedStrengthService.java index e2a7406..01b4928 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/AuthorizedStrengthService.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/AuthorizedStrengthService.java @@ -6,4 +6,5 @@ import java.util.Map; public interface AuthorizedStrengthService { List> getDepartmentAuthorizedStrength(Map params); + } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java index 2d3adb0..f893f8e 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java @@ -27,5 +27,11 @@ public interface OrganaztionService { Map getDepartmentChangeToken(Map params); + /** + * 获取原组织组织树变更 + * @param params + * @return + */ + List> getDepartmentTree(Map params); } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java index 7c361e4..1980d6d 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java @@ -188,4 +188,5 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService return resultList; } + } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java index d33b08a..e588aee 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.jcl.organization.service.impl; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.weaver.common.component.table.AbstractWeaTable; @@ -239,4 +240,19 @@ public class OrganaztionSeviceImpl implements OrganaztionService { return resultMap; } + + @Override + public List> getDepartmentTree(Map params) { + String id = params.get("id"); + String sql = "select zz id,sjzz parentId,zzmc content from uf_organization_zzsj where form_data_id=?"; + List> dataList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(id)); + for (Map map:dataList){ + map.put("type","department"); + map.put("leaf",true); + map.put("children", Lists.newArrayList()); + map.put("dataStatus","exist"); + } + + return dataList; + } }