From 4b981d72fa10f7dc1412e65112f8bb3a576d64f6 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 30 Oct 2023 10:11:06 +0800 Subject: [PATCH 1/7] update --- .../com/jsowell/common/core/domain/entity/SysDept.java | 9 +++++++++ .../src/main/resources/mapper/system/SysDeptMapper.xml | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/entity/SysDept.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/entity/SysDept.java index 4ed76ea6b..dca0ba35c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/entity/SysDept.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/entity/SysDept.java @@ -1,6 +1,8 @@ package com.jsowell.common.core.domain.entity; import com.jsowell.common.core.domain.BaseEntity; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -16,6 +18,8 @@ import java.util.List; * * @author jsowell */ +@Getter +@Setter public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,6 +33,11 @@ public class SysDept extends BaseEntity { */ private Long parentId; + /** + * 部门等级(0-平台级;1-一级运营商;2-二级运营商;3-站点) + */ + private String deptLevel; + /** * 祖级列表 */ diff --git a/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml b/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml index 34cf61028..e9cbd7978 100644 --- a/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,7 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + select d.dept_id, d.parent_id, d.dept_level, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, + d.status, d.del_flag, d.create_by, d.create_time from sys_dept d From 7298f9b81ffd3ca954bac37c3bff1dc5a820da5a Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 30 Oct 2023 11:17:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysDeptMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml b/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml index e9cbd7978..b854f4afb 100644 --- a/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/jsowell-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, parent_id, + dept_level, dept_name, ancestors, order_num, @@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{parentId}, + #{deptLevel}, #{deptName}, #{ancestors}, #{orderNum}, @@ -121,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept parent_id = #{parentId}, + dept_level = #{deptLevel}, dept_name = #{deptName}, ancestors = #{ancestors}, order_num = #{orderNum}, From 0168f7af51640825f788dc4c64fa2c322cf56cd2 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 30 Oct 2023 15:09:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0deptLevel=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/system/service/impl/SysDeptServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java index 7ace00420..53233832d 100644 --- a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java +++ b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java @@ -209,6 +209,11 @@ public class SysDeptServiceImpl implements SysDeptService { String oldAncestors = oldDept.getAncestors(); dept.setAncestors(newAncestors); updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); + + // 更新deptLevel字段 + if (StringUtils.isNotBlank(newParentDept.getDeptLevel())) { + dept.setDeptLevel(String.valueOf(Integer.parseInt(newParentDept.getDeptLevel()) + 1)); + } } int result = deptMapper.updateDept(dept); if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) From fd875f2650ab1bce6d3251d80ae5a1e69a46386d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 31 Oct 2023 14:38:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?update=20=E6=98=BE=E7=A4=BA=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E5=8D=95=E5=8F=B7=E5=92=8C=E6=8F=90=E7=8E=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/financial/financeDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index 52695fcea..553f78f78 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -169,7 +169,7 @@ - +