LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 组织机构管理 bug 40291,40294,40289,40287,40286,40285

Browse Source
This commit is contained in:
lijiarao
2021-10-12 16:43:57 +08:00
parent 92b9458c3a
commit cea7b7c8d3
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java
+2 -4
View File
@@ -38,7 +38,7 @@ public class SysDepart implements Serializable {
@Excel(name="上级部门",width=15,orderNum = "1",dictTable = "sys_depart",dicText = "depart_name",dicCode = "id")
private String parentId;
/**机构/部门名称*/
@Excel(name="机构/部门名称",width=15)
@Excel(name="机构名称",width=15)
private String departName;
/**英文名*/
private String departNameEn;
@@ -50,10 +50,8 @@ public class SysDepart implements Serializable {
@Max(value = 99999,message = "排序最小为1，最大为99999")
private BigDecimal departOrder;
/**描述*/
@Excel(name="描述",width=15)
private String description;
/**机构类别 1公司，2组织机构，2岗位*/
@Excel(name="机构类别",width=15,dicCode="org_category",orderNum = "3")
private String orgCategory;
/**机构类型*/
@@ -62,7 +60,7 @@ public class SysDepart implements Serializable {
@Excel(name="机构编码",width=15,orderNum = "2")
private String orgCode;
/**手机号*/
@Excel(name="电话",width=15,orderNum = "5")
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
private String mobile;
/**传真*/
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
+2 -4
View File
@@ -18,7 +18,7 @@ public class SysDepartExcel {
@Excel(name="上级部门",width=15,orderNum = "1",dictTable = "sys_depart",dicText = "depart_name",dicCode = "id")
private String parentId;
/**机构/部门名称*/
@Excel(name="机构/部门名称",width=15)
@Excel(name="机构名称",width=15)
private String departName;
/**排序*/
@Excel(name="排序",width=15,orderNum = "4")
@@ -27,17 +27,15 @@ public class SysDepartExcel {
@Pattern(regexp = "^[1-9](\\d{0,4})$",message = "排序格式错误")
private String departOrder;
/**描述*/
@Excel(name="描述",width=15)
private String description;
/**机构类别 1公司，2组织机构，2岗位*/
@Excel(name="机构类别",width=15,dicCode="org_category",orderNum = "3")
private String orgCategory;
/**机构编码*/
@Excel(name="机构编码",width=15,orderNum = "2")
private String orgCode;
/**手机号*/
@Excel(name="电话",width=15,orderNum = "5")
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
private String mobile;
/**传真*/