From 700ac5685214d37f128b3ad3dfda59e80381b9f6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 17:52:38 +0800
Subject: [PATCH] 修改创建人更新人，修改文件所属人对比
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java | 11
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/NcLogInfoServiceImpl.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Menu.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessInfo.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupDepart.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/Department.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PermissionStream.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductDepartment.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsDepartment.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupPermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java | 11
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocClassification.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/FileOperate.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml | 16
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectBase.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/DepartmentTreeModel.java | 302 ++++++++++++++++++++++++++++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 11
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentPermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsPermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/NcLogInfo.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java | 12
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButton.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentDepartment.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/MenuButton.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceInfo.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermissionStream.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButtonPermission.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java | 8
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java | 12
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 10
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java | 11
43 files changed, 450 insertions(+), 134 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentDepartment.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentDepartment.java
index ef34b5b..f30c0ba 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentDepartment.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentDepartment.java
@@ -24,8 +24,8 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
public ComponentDepartment(String componentId, String departId){
this.componentId = componentId;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
index c1362bb..ff3079b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.math.BigDecimal;
import java.util.Date;
@@ -59,10 +60,12 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentPermission.java
index ae488a8..e433d0a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentPermission.java
@@ -24,8 +24,8 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
public ComponentPermission(String componentId, String userId){
this.componentId = componentId;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
index b6d6925..6383363 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
@@ -36,10 +36,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
index 8f0bd80..f09e973 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
@@ -32,10 +32,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupDepart.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupDepart.java
index e1bf81a..1d36fea 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupDepart.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupDepart.java
@@ -24,6 +24,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupPermission.java
index 8ab9ad4..d962391 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroupPermission.java
@@ -24,6 +24,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceInfo.java
index f9e3a59..b97f586 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceInfo.java
@@ -41,10 +41,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermission.java
index f174c21..3a93b51 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermission.java
@@ -24,6 +24,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermissionStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermissionStream.java
index 62fc06e..b487bea 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermissionStream.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DevicePermissionStream.java
@@ -28,11 +28,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocClassification.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocClassification.java
index 7d8a0d8..7e67dbe 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocClassification.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocClassification.java
@@ -26,11 +26,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
index 70c61ba..7d2d7d0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
@@ -38,10 +38,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
index 417ec66..ac51391 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
@@ -42,12 +42,12 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
index 7118a96..7ab9ee7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
@@ -28,11 +28,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/FileOperate.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/FileOperate.java
index 23daf78..6f48901 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/FileOperate.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/FileOperate.java
@@ -20,8 +20,8 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Menu.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Menu.java
index b957c54..2f0aa53 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Menu.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Menu.java
@@ -28,11 +28,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/MenuButton.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/MenuButton.java
index 344e289..adb3e81 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/MenuButton.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/MenuButton.java
@@ -26,6 +26,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/NcLogInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/NcLogInfo.java
index 2f55cca..4cacc60 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/NcLogInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/NcLogInfo.java
@@ -67,8 +67,8 @@
private Date createTime;
@Excel(name = "鎿嶄綔浜�",width = 15)
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectBase.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectBase.java
index 8da7cb3..4c78de1 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectBase.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectBase.java
@@ -24,11 +24,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButton.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButton.java
index 6780ded..e86d8e9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButton.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButton.java
@@ -26,6 +26,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButtonPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButtonPermission.java
index 079f6a4..a5f324c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButtonPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ObjectButtonPermission.java
@@ -23,6 +23,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsDepartment.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsDepartment.java
index e433d73..3a4ef07 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsDepartment.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsDepartment.java
@@ -24,8 +24,8 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
public PartsDepartment(String partsId, String departId){
this.partsId = partsId;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
index 2cd51e1..5ae3c9c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.math.BigDecimal;
import java.util.Date;
@@ -54,10 +55,12 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsPermission.java
index bf868c8..ec3b77e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsPermission.java
@@ -23,8 +23,8 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
public PartsPermission(String partsId, String userId){
this.partsId = partsId;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PermissionStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PermissionStream.java
index 83a5724..d0f3ef8 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PermissionStream.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PermissionStream.java
@@ -43,11 +43,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessInfo.java
index ebf43fe..8fa7a43 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessInfo.java
@@ -30,11 +30,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
index 3f32041..fcb70fd 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
+
import java.util.Date;
@Data
@@ -46,11 +48,13 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductDepartment.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductDepartment.java
index 80abc0f..8f0a89d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductDepartment.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductDepartment.java
@@ -24,6 +24,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
index 220b3bd..57828ee 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.util.Date;
/**
@@ -32,10 +33,12 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
index cdca862..0094847 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
@@ -24,6 +24,6 @@
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index a42e52e..7bbf9de 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.io.Serializable;
import java.util.Date;
@@ -67,11 +68,13 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
index 86ba7b2..f39990c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
@@ -122,8 +122,8 @@
, comp.description
, comp.create_time
, comp.update_time
- , comp.update_user
- , comp.create_user
+ , comp.update_by
+ , comp.create_by
from nc_component_info comp
inner join
(select distinct component_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
index b3ab01a..afeb2f7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
@@ -77,8 +77,8 @@
, comp.description
, comp.CREATE_TIME
, comp.UPDATE_TIME
- , comp.CREATE_USER
- , comp.UPDATE_USER
+ , comp.create_by
+ , comp.update_by
from nc_device_group comp
inner join
(select distinct group_id from nc_device_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
index 0e54ee9..6eb679e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
@@ -13,8 +13,8 @@
, d.depart_id
, d.CREATE_TIME
, d.UPDATE_TIME
- , d.CREATE_USER
- , d.UPDATE_USER
+ , d.create_by
+ , d.update_by
from nc_device_info d
inner join (select device_id from nc_device_permission where user_id=#{userId}) dp
on d.device_id=dp.device_id
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
index 11283e2..46cae6f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
@@ -16,19 +16,19 @@
,u.publish_version
,u.description
,u.CREATE_TIME
- ,u.CREATE_USER
+ ,u.create_by
,u.UPDATE_TIME
- ,u.UPDATE_USER
+ ,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
,s.realname as pullUser
from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
inner join
(select * from nc_doc_info where delete_flag=0) u
on r.doc_id = u.doc_id
- left join (select doc_id, create_user from nc_file_operate where delete_flag=0) o
+ left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
left join sys_user s
- on o.create_user=s.id
+ on o.create_by=s.id
${ew.customSqlSegment}
</select>
@@ -48,9 +48,9 @@
,u.publish_version
,u.description
,u.CREATE_TIME
- ,u.CREATE_USER
+ ,u.create_by
,u.UPDATE_TIME
- ,u.UPDATE_USER
+ ,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
,s.realname as pullUser
,(case when t.sync_flag is null then 2 else t.sync_flag end) as syncStatus
@@ -58,10 +58,10 @@
inner join
(select * from nc_doc_info where delete_flag=0) u
on r.doc_id = u.doc_id
- left join (select doc_id, create_user from nc_file_operate where delete_flag=0) o
+ left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
left join sys_user s
- on o.create_user=s.id
+ on o.create_by=s.id
left join (select distinct file_id, doc_id, device_id, sync_flag from nc_to_equipment_lists where delete_flag = 0) t
on u.doc_id=t.doc_id and u.publish_file_id=t.file_id and r.attribution_id=t.device_id
${ew.customSqlSegment}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
index 3dbc029..45c860a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
@@ -19,9 +19,9 @@
, p.parts_status
, p.description
, p.CREATE_TIME
- , p.CREATE_USER
+ , p.create_by
, p.UPDATE_TIME
- , p.UPDATE_USER
+ , p.update_by
from nc_parts_info p
inner join
(select distinct parts_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
index 6b345e2..0c1045f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
@@ -17,9 +17,9 @@
, p.ASSEMBLE_NAME
, p.DESCRIPTION
, p.CREATE_TIME
- , p.CREATE_USER
+ , p.create_by
, p.UPDATE_TIME
- , p.UPDATE_USER
+ , p.update_by
from nc_process_stream p
inner join
(select distinct PROCESS_ID from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
index 9c78e54..0cb402f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
@@ -9,8 +9,8 @@
, p.product_status
, p.CREATE_TIME
, p.UPDATE_TIME
- , p.create_user
- , p.update_user
+ , p.create_by
+ , p.update_by
from nc_product_info p
inner join
(select distinct product_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
index 52a9d4c..476ceec 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
@@ -14,9 +14,9 @@
, p.craft_version
, p.step_type
, p.CREATE_TIME
- , p.create_user
+ , p.create_by
, p.UPDATE_TIME
- , p.update_user
+ , p.update_by
, p.description
, p.device_no
, p.assemble_no
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/DepartmentTreeModel.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/DepartmentTreeModel.java
new file mode 100644
index 0000000..977dd1e
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/DepartmentTreeModel.java
@@ -0,0 +1,302 @@
+package org.jeecg.modules.dnc.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.jeecg.common.api.vo.ScopedSlots;
+import org.jeecg.modules.dnc.ucenter.Department;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * DNC閮ㄩ棬琛� 瀛樺偍鏍戠粨鏋勬暟鎹殑瀹炰綋绫�
+ * <p>
+ *
+ * @Author Steve
+ * @Since 2019-01-22
+ */
+
+public class DepartmentTreeModel implements Serializable{
+
+ private static final long serialVersionUID = 1L;
+
+ /** 瀵瑰簲SysDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey*/
+ private String key;
+
+ /** 瀵瑰簲SysDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨剉alue*/
+ private String value;
+
+ /** 瀵瑰簲depart_name瀛楁,鍓嶇鏁版嵁鏍戜腑鐨則itle*/
+ private String title;
+
+
+ private boolean isLeaf;
+ // 浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶴ysDepart鐩稿悓
+
+ private String departId;
+ private String departName;
+
+ public String getDepartCode() {
+ return departCode;
+ }
+
+ public void setDepartCode(String departCode) {
+ this.departCode = departCode;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public boolean isLeaf() {
+ return isLeaf;
+ }
+
+ public void setLeaf(boolean leaf) {
+ isLeaf = leaf;
+ }
+
+ public String getDepartId() {
+ return departId;
+ }
+
+ public void setDepartId(String departId) {
+ this.departId = departId;
+ }
+
+ public String getDepartName() {
+ return departName;
+ }
+
+ public void setDepartName(String departName) {
+ this.departName = departName;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public Integer getPriority() {
+ return priority;
+ }
+
+ public void setPriority(Integer priority) {
+ this.priority = priority;
+ }
+
+ public Integer getRankLevel() {
+ return rankLevel;
+ }
+
+ public void setRankLevel(Integer rankLevel) {
+ this.rankLevel = rankLevel;
+ }
+
+ public String getMgrMan() {
+ return mgrMan;
+ }
+
+ public void setMgrMan(String mgrMan) {
+ this.mgrMan = mgrMan;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getcreateBy() {
+ return createBy;
+ }
+
+ public void setcreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getupdateBy() {
+ return updateBy;
+ }
+
+ public void setupdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Integer getDeleteFlag() {
+ return deleteFlag;
+ }
+
+ public void setDeleteFlag(Integer deleteFlag) {
+ this.deleteFlag = deleteFlag;
+ }
+
+ public Integer getPositionType() {
+ return positionType;
+ }
+
+ public void setPositionType(Integer positionType) {
+ this.positionType = positionType;
+ }
+
+ public String getDirectorUserIds() {
+ return directorUserIds;
+ }
+
+ public void setDirectorUserIds(String directorUserIds) {
+ this.directorUserIds = directorUserIds;
+ }
+
+ public void setChildren(List<DepartmentTreeModel> children) {
+ this.children = children;
+ }
+
+ private String departCode;
+ private String parentId;
+ private Integer priority;
+ private Integer rankLevel;
+ private String mgrMan;
+ private String description;
+ private Date createTime;
+ private Date updateTime;
+ private String createBy;
+ private String updateBy;
+ private Integer deleteFlag = 0;
+ @TableField(exist = false)
+ private Integer positionType;
+
+ //update-begin---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁閮ㄩ棬璐熻矗浜篿ds
+ /**閮ㄩ棬璐熻矗浜篿ds*/
+ private String directorUserIds;
+ //update-end---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁閮ㄩ棬璐熻矗浜篿ds
+
+ private List<DepartmentTreeModel> children = new ArrayList<>();
+
+ private ScopedSlots scopedSlots = new ScopedSlots();
+ private Department entity;
+ /**
+ * 灏哠ysDepart瀵硅薄杞崲鎴怱ysDepartTreeModel瀵硅薄
+ * @param Department
+ */
+ public DepartmentTreeModel(Department Department) {
+ this.key = Department.getDepartId();
+ this.value = Department.getDepartId();
+ this.title = Department.getDepartName();
+ this.departId = Department.getDepartId();
+ this.departCode= Department.getDepartCode();
+ this.priority=Department.getPriority();
+ this.rankLevel=Department.getRankLevel();
+ this.mgrMan=Department.getMgrMan();
+ this.parentId = Department.getParentId();
+ this.departName = Department.getDepartName();
+ this.description = Department.getDescription();
+ this.createBy = Department.getCreateBy();
+ this.createTime = Department.getCreateTime();
+ this.updateBy = Department.getUpdateBy();
+ this.updateTime = Department.getUpdateTime();
+ this.deleteFlag=Department.getDeleteFlag();
+ this.entity = Department;
+ }
+
+ public DepartmentTreeModel() { }
+
+
+ public List<DepartmentTreeModel> getChildren() {
+ return children;
+ }
+
+ public ScopedSlots getScopedSlots(){return scopedSlots;}
+
+ public void setScopedSlots(ScopedSlots scopedSlots){this.scopedSlots = scopedSlots;}
+
+ public Department getEntity(){return entity;}
+
+ public void setEntity(Department entity){this.entity = entity;}
+
+
+
+ /**
+ * 閲嶅啓equals鏂规硶
+ */
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ DepartmentTreeModel model = (DepartmentTreeModel) o;
+ return Objects.equals(departId, model.departId) &&
+ Objects.equals(parentId, model.parentId) &&
+ Objects.equals(departName, model.departName) &&
+ Objects.equals(departCode, model.departCode) &&
+ Objects.equals(priority, model.priority) &&
+ Objects.equals(rankLevel, model.rankLevel) &&
+ Objects.equals(description, model.description) &&
+ Objects.equals(mgrMan, model.mgrMan) &&
+ Objects.equals(deleteFlag, model.deleteFlag) &&
+ Objects.equals(createBy, model.createBy) &&
+ Objects.equals(createTime, model.createTime) &&
+ Objects.equals(updateBy, model.updateBy) &&
+ Objects.equals(updateTime, model.updateTime) &&
+ Objects.equals(directorUserIds, model.directorUserIds) &&
+ Objects.equals(children, model.children);
+ }
+
+ /**
+ * 閲嶅啓hashCode鏂规硶
+ */
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(departId, parentId, departName, departCode, priority,
+ rankLevel, description, mgrMan, deleteFlag, createBy, createTime, updateBy, updateTime,
+ children,directorUserIds);
+ }
+
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 4a4c131..7a0745f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -351,11 +351,10 @@
if(file == null || file.isEmpty() || !ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_OPERATE_PUSH_FAIL);
DocInfo en = super.getById(id);
if(en == null)
@@ -527,11 +526,10 @@
if(!ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_CANCEL_PULL_ERROR);
DocInfo en = super.getById(id);
if(en == null)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/NcLogInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/NcLogInfoServiceImpl.java
index 8bb459c..d2bb3e3 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/NcLogInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/NcLogInfoServiceImpl.java
@@ -63,7 +63,7 @@
IPage<NcLogInfo> userIPage = this.page(pageData, queryWrapper);
/*if (userIPage != null && userIPage.getRecords() != null && !userIPage.getRecords().isEmpty()) {
for (NcLogInfo nc : userIPage.getRecords()) {
- User user = userService.getById(nc.getCreateUser());
+ User user = userService.getById(nc.getCreateBy());
if (user != null) {
nc.setNickname(user.getNickname());
nc.setUsername(user.getUsername());
@@ -80,7 +80,7 @@
//璁剧疆IP鍦板潃
logInfo.setIp(IpUtils.getIpAddr(request));
super.save(logInfo);
- SysUser user = userService.getById(logInfo.getCreateUser());
+ SysUser user = userService.getById(logInfo.getCreateBy());
if (user != null) {
logInfo.setNickName(user.getRealname());
logInfo.setUserName(user.getUsername());
@@ -100,7 +100,7 @@
//璁剧疆IP鍦板潃
logInfo.setIp(IpUtils.getIpAddr(request));
super.save(logInfo);
- SysUser user = userService.getById(logInfo.getCreateUser());
+ SysUser user = userService.getById(logInfo.getCreateBy());
if (user != null) {
logInfo.setNickName(user.getRealname());
logInfo.setUserName(user.getUsername());
@@ -132,7 +132,7 @@
ncLogInfoList.forEach(item->{
//缈昏瘧鐢ㄦ埛鍚嶃�佹搷浣滅被鍨�
item.setOperateTypeStr(iSysDictService.queryDictTextByKey("OPERATE_TYPE",item.getOperateType().toString()));
- item.setCreateUser(userService.getById(item.getCreateUser()).getRealname());
+ item.setCreateBy(userService.getById(item.getCreateBy()).getRealname());
});
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/Department.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/Department.java
index 39b7520..7ff9f36 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/Department.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/Department.java
@@ -28,11 +28,11 @@
@TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
private Date updateTime;
@JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
@JsonIgnore
- @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
--
Gitblit v1.9.3