From 78f354ed7c5c2504efe0b43b576683f50b8dd794 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 10 Dec 2025 10:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=8F=8A?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 235 +++++++++++++----- .../manager/service/UserService.java | 2 + .../manager/service/impl/UserServiceImpl.java | 6 + .../controller/PublicLoginController.java | 8 +- .../common/core/domain/entity/SysDept.java | 20 ++ .../bns/system/service/ISysDeptService.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 4 +- 7 files changed, 211 insertions(+), 66 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 083567d..70c64b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,12 @@ - + + + + + + - { - "keyToString": { - "Maven.HnRealNameBmw [clean].executor": "Run", - "Maven.HnRealNameBmw [install].executor": "Run", - "Maven.ldlz [clean].executor": "Run", - "Maven.ldlz [install].executor": "Run", - "Maven.realname-app [clean].executor": "Run", - "Maven.realname-app [install].executor": "Run", - "RequestMappingsPanelOrder0": "0", - "RequestMappingsPanelOrder1": "1", - "RequestMappingsPanelWidth0": "75", - "RequestMappingsPanelWidth1": "75", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "SONARLINT_PRECOMMIT_ANALYSIS": "true", - "Spring Boot.BonusGatewayApplication.executor": "Debug", - "Spring Boot.CzlScreenApplication.executor": "Debug", - "Spring Boot.CzlServiceApplication.executor": "Debug", - "Spring Boot.HnRealNameBmwApplication.executor": "Debug", - "Spring Boot.LdlzApplication.executor": "Debug", - "Spring Boot.RnamaApplication.executor": "Run", - "Spring Boot.RnmwApplication.executor": "Debug", - "git-widget-placeholder": "main", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "F:/workspace/idea/hn_cloud_service/hn-ldlz/ldlz-admin/src/main/resources/mapper/ldlz/slave", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Project", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.43843496", - "run.configurations.included.in.services": "true", - "settings.editor.selected.configurable": "MavenSettings", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -111,61 +117,85 @@ - - + + - + - + - - - + - - - - + + + + + + + + + + @@ -186,7 +216,7 @@ @@ -262,9 +348,29 @@ file://$PROJECT_DIR$/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/impl/UserServiceImpl.java - 126 + 132 + + file://$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/person/controller/FaceContrastController.java + 70 + + + file://$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/smallSubManagement/service/impl/DataCountServiceImpl.java + 242 + + + file://$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/basic/controller/SubContractorController.java + 221 + + + file://$PROJECT_DIR$/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/login/controller/PublicLoginController.java + 61 + file://$PROJECT_DIR$/hn-ldlz/ldlz-system/src/main/java/com/bns/system/mapper/SysUserPostMapper.java 42 @@ -277,4 +383,9 @@ + + + com.bonus.hnrn.rnbmw.* + + \ No newline at end of file diff --git a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/UserService.java b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/UserService.java index a9619f7..7844f0c 100644 --- a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/UserService.java +++ b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/UserService.java @@ -25,6 +25,8 @@ public interface UserService { List getDepartmentTree(); + List getPublicDepartmentTree(); + List getRole(); int addInfo(SysUser bean); diff --git a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/impl/UserServiceImpl.java b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/impl/UserServiceImpl.java index f345d59..804cbc5 100644 --- a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/impl/UserServiceImpl.java +++ b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/service/impl/UserServiceImpl.java @@ -113,6 +113,12 @@ public class UserServiceImpl implements UserService { return userDao.getDepartmentTree(o); } + @Override + public List getPublicDepartmentTree() { + ZNode o = new ZNode(); + return userDao.getDepartmentTree(o); + } + @Override public List getRole() { return userDao.getRole(); diff --git a/hn-ldlz/ldlz-admin/src/main/java/com/bns/ldlz/controller/PublicLoginController.java b/hn-ldlz/ldlz-admin/src/main/java/com/bns/ldlz/controller/PublicLoginController.java index f83e9bd..04d9d7c 100644 --- a/hn-ldlz/ldlz-admin/src/main/java/com/bns/ldlz/controller/PublicLoginController.java +++ b/hn-ldlz/ldlz-admin/src/main/java/com/bns/ldlz/controller/PublicLoginController.java @@ -63,7 +63,13 @@ public class PublicLoginController { @PostMapping("getDeptTree") @ApiOperation(value = "获取部门树") public AjaxResult getDeptTree(SysDept dept) { - List list=deptService.selectPublicDeptTreeList(dept); + List list=deptService.selectPublicDeptTreeList(dept); + if(list.size()>0){ + list.forEach(item->{ + item.setpId(item.getParentId()); + item.setId(item.getDeptId()); + }); + } return AjaxResult.success(list); } diff --git a/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java b/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java index 9a9c4a6..ef13b20 100644 --- a/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java +++ b/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java @@ -19,9 +19,13 @@ import com.bns.common.core.domain.BaseEntity; public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; + private Long id; + /** 部门ID */ private Long deptId; + private Long pId; + /** 父部门ID */ private Long parentId; @@ -61,10 +65,26 @@ public class SysDept extends BaseEntity { /** 子部门 */ private List children = new ArrayList(); + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public Long getDeptId() { return deptId; } + public Long getpId() { + return pId; + } + + public void setpId(Long pId) { + this.pId =pId; + } + public void setDeptId(Long deptId) { this.deptId = deptId; } diff --git a/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/ISysDeptService.java b/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/ISysDeptService.java index 8a633ec..2e9fbae 100644 --- a/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/ISysDeptService.java +++ b/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/ISysDeptService.java @@ -36,7 +36,7 @@ public interface ISysDeptService */ public List selectDeptTreeList(SysDept dept); - public List selectPublicDeptTreeList(SysDept dept); + public List selectPublicDeptTreeList(SysDept dept); public List selectDeptUserTreeList(SysUser user); public List selectDeptOkUserTreeList(String userIds); diff --git a/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/impl/SysDeptServiceImpl.java b/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/impl/SysDeptServiceImpl.java index 7d9e5d0..dc97d53 100644 --- a/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/impl/SysDeptServiceImpl.java +++ b/hn-ldlz/ldlz-system/src/main/java/com/bns/system/service/impl/SysDeptServiceImpl.java @@ -82,10 +82,10 @@ public class SysDeptServiceImpl implements ISysDeptService * @return 部门树信息集合 */ @Override - public List selectPublicDeptTreeList(SysDept dept) + public List selectPublicDeptTreeList(SysDept dept) { List depts = SpringUtils.getAopProxy(this).selectPublicDeptList(dept); - return buildDeptTreeSelect(depts); + return depts; }