From f368ebd6231da8041494691d7b898e35d3b6ac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 16 Nov 2022 13:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/user/enums/UserResponseEnum.java | 4 +++- .../src/main/java/com/njcn/user/pojo/param/DeptParam.java | 4 ++++ .../user-api/src/main/java/com/njcn/user/pojo/po/Dept.java | 7 +++++++ .../src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java | 3 +++ .../src/main/java/com/njcn/user/pojo/vo/DeptVO.java | 5 +++++ .../main/java/com/njcn/user/mapper/mapping/DeptMapper.xml | 1 + .../java/com/njcn/user/service/impl/DeptServiceImpl.java | 6 +++++- 7 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/enums/UserResponseEnum.java b/pqs-user/user-api/src/main/java/com/njcn/user/enums/UserResponseEnum.java index 14b9a5471..bd27e9545 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/enums/UserResponseEnum.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/enums/UserResponseEnum.java @@ -82,7 +82,9 @@ public enum UserResponseEnum { DEPT_NAME_REPEAT("A0116","部门名称重复"), - ROLE_NAME_REPEAT("A0117","角色名称重复"); + ROLE_NAME_REPEAT("A0117","角色名称重复"), + DEPT_PID_EXCEPTION("A0118","新增部门父节点信息异常"), + ; private final String code; diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/DeptParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/DeptParam.java index 99c504636..5aca0fca0 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/DeptParam.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/DeptParam.java @@ -32,6 +32,9 @@ public class DeptParam { @Pattern(regexp = PatternRegex.DEPT_NAME_REGEX, message = ValidMessage.NAME_FORMAT_ERROR) private String name; + @ApiModelProperty("部门编号") + private String code; + @ApiModelProperty("排序") @NotNull(message = ValidMessage.SORT_NOT_NULL) @Min(value = 0, message = ValidMessage.SORT_FORMAT_ERROR) @@ -39,6 +42,7 @@ public class DeptParam { private Integer sort; @ApiModelProperty("部门类型 0-非自定义；1-web自定义；2-App自定义") + @NotNull(message = "部门类型不能为空") private Integer type; @ApiModelProperty("描述") diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java index 755c1d111..89a89341c 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java @@ -1,5 +1,6 @@ package com.njcn.user.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; @@ -37,6 +38,12 @@ public class Dept extends BaseEntity { */ private String name; + /** + * 部门编号 + */ + @TableField(exist=false) + private String code; + /** * （sys_Area）行政区域Id，自定义部门无需填写部门 */ diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java index 914ca2a96..113306827 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java @@ -14,6 +14,9 @@ import java.util.List; @Data public class DeptTreeVO extends BaseVO { + @ApiModelProperty("部门编号") + private String code; + @ApiModelProperty("行政区域id") private String area; diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptVO.java index 9fc690ba6..dd61a1ab5 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptVO.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptVO.java @@ -35,6 +35,11 @@ public class DeptVO implements Serializable { */ private String name; + /** + * 部门编号 + */ + private String code; + /** * 行政区域name */ diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml index 42ce5f280..c055665c0 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml @@ -23,6 +23,7 @@ SELECT sys_dept.pids pids FROM sys_dept sys_dept WHERE sys_dept.id = #{id} + and sys_dept.state = 1