From 0ad3eba4969b62cec3d9214fb2856aed9ddcb850 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 七月 2024 16:48:51 +0800
Subject: [PATCH] 部门管理字段修正
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java | 28 +---------------------------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java | 12 +-----------
2 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index 4d7e977..a91b975 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -88,14 +88,6 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
- /**浣跨敤閮ㄩ棬缂栫爜*/
-// @TableField(exist = false)
- private String useDepartNum;
-
- /**缁翠慨閮ㄩ棬缂栫爜*/
-// @TableField(exist = false)
- private String repairDepartNum;
-
//update-begin---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁璐熻矗浜篿ds鍜屾棫鐨勮礋璐ｄ汉ids
/**閮ㄩ棬璐熻矗浜虹殑ids*/
@TableField(exist = false)
@@ -139,8 +131,6 @@
Objects.equals(createBy, depart.createBy) &&
Objects.equals(createTime, depart.createTime) &&
Objects.equals(updateBy, depart.updateBy) &&
- Objects.equals(useDepartNum, depart.useDepartNum) &&
- Objects.equals(repairDepartNum, depart.repairDepartNum) &&
Objects.equals(updateTime, depart.updateTime);
}
@@ -153,6 +143,6 @@
return Objects.hash(super.hashCode(), id, parentId, departName,
departNameEn, departNameAbbr, departOrder, description,orgCategory,
orgType, orgCode, mobile, fax, address, memo, status,
- delFlag, createBy, createTime, updateBy, updateTime,useDepartNum,repairDepartNum);
+ delFlag, createBy, createTime, updateBy, updateTime);
}
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index 54b5434..7846a56 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -76,12 +76,6 @@
private Date updateTime;
- /**浣跨敤閮ㄩ棬缂栫爜*/
- private String useDepartNum;
-
- /**缁翠慨閮ㄩ棬缂栫爜*/
- private String repairDepartNum;
-
//update-begin---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁閮ㄩ棬璐熻矗浜篿ds
/**閮ㄩ棬璐熻矗浜篿ds*/
private String directorUserIds;
@@ -122,8 +116,6 @@
this.updateBy = sysDepart.getUpdateBy();
this.updateTime = sysDepart.getUpdateTime();
this.directorUserIds = sysDepart.getDirectorUserIds();
- this.useDepartNum = sysDepart.getUseDepartNum();
- this.repairDepartNum = sysDepart.getRepairDepartNum();
this.entity = sysDepart;
}
@@ -358,22 +350,6 @@
this.directorUserIds = directorUserIds;
}
- public String getUseDepartNum() {
- return useDepartNum;
- }
-
- public void setUseDepartNum(String useDepartNum) {
- this.useDepartNum = useDepartNum;
- }
-
- public String getRepairDepartNum() {
- return repairDepartNum;
- }
-
- public void setRepairDepartNum(String repairDepartNum) {
- this.repairDepartNum = repairDepartNum;
- }
-
public ScopedSlots getScopedSlots(){return scopedSlots;}
public void setScopedSlots(ScopedSlots scopedSlots){this.scopedSlots = scopedSlots;}
@@ -418,8 +394,6 @@
Objects.equals(updateBy, model.updateBy) &&
Objects.equals(updateTime, model.updateTime) &&
Objects.equals(directorUserIds, model.directorUserIds) &&
- Objects.equals(useDepartNum, model.useDepartNum) &&
- Objects.equals(repairDepartNum, model.repairDepartNum) &&
Objects.equals(children, model.children);
}
@@ -432,7 +406,7 @@
return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
- children,directorUserIds,useDepartNum,repairDepartNum);
+ children,directorUserIds);
}
}
--
Gitblit v1.9.3