Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -35,9 +35,16 @@ public class SysDept extends BaseEntity {
      * 父部门ID
      */
     private Long parentId;
+
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    @Excel(name = "部门名称")
+    private String deptName;
+
     /**
      * 部门编码
      */
+    @Excel(name = "部门编码")
     private String deptCode;
 
     /**
@@ -45,10 +52,6 @@ public class SysDept extends BaseEntity {
      */
     private String ancestors;
 
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    @Excel(name = "部门名称")
-    private String deptName;
 
     @NotNull(message = "显示顺序不能为空")
     private Integer orderNum;
@@ -59,10 +62,12 @@ public class SysDept extends BaseEntity {
     private String leader;
 
     @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    @Excel(name = "单位电话")
     private String phone;
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    @Excel(name = "单位邮箱")
     private String email;
 
     /**
@@ -77,9 +82,9 @@ public class SysDept extends BaseEntity {
     private String delFlag;
 
     /**
-     * 父部门名称
+     * 上级部门名称
      */
-    //@Excel(name = "父部门名称")
+    @Excel(name = "上级部门名称")
     @TableField(exist = false)
     private String parentName;
 

base-system/src/main/java/com/ozs/system/service/ISysDeptService.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.ozs.common.core.domain.TreeSelect;
 import com.ozs.common.core.domain.entity.SysDept;
-import com.ozs.system.domain.SysConfig;
 import icu.mhb.mybatisplus.plugln.base.service.JoinIService;
 
 /**