From bb98d179dd020e0b003446cb35ce422651ab8acd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/PersonAndDeptConfig.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/PersonAndDeptConfig.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/PersonAndDeptConfig.java
index 2156249..c14292b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/PersonAndDeptConfig.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/PersonAndDeptConfig.java
@@ -3,6 +3,8 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
+import java.util.List;
+
@ConfigurationProperties(prefix="org.applypersonanddept")
@Component
public class PersonAndDeptConfig {
@@ -34,7 +36,16 @@
/***
* 鏄惁寮�鍚�
*/
- private boolean isUsedFlag;
+ private boolean usedFlag;
+ /***
+ * 浜哄憳鎺ュ彛鏋氫妇鍊煎瓧娈�
+ */
+ private String personFields;
+
+ /***
+ * 缁勭粐鎺ュ彛鏋氫妇鍊煎瓧娈�
+ */
+ private String deptFields;
public String getPersonLibrary() {
return personLibrary;
@@ -69,11 +80,11 @@
}
public boolean isUsedFlag() {
- return isUsedFlag;
+ return usedFlag;
}
public void setUsedFlag(boolean usedFlag) {
- isUsedFlag = usedFlag;
+ this.usedFlag = usedFlag;
}
public boolean isPersonApplyGroupCode() {
@@ -92,6 +103,22 @@
this.deptApplyGroupCode = deptApplyGroupCode;
}
+ public String getPersonFields() {
+ return personFields;
+ }
+
+ public void setPersonFields(String personFields) {
+ this.personFields = personFields;
+ }
+
+ public String getDeptFields() {
+ return deptFields;
+ }
+
+ public void setDeptFields(String deptFields) {
+ this.deptFields = deptFields;
+ }
+
@Override
public String toString() {
return "PersonAndDeptConfig{" +
@@ -101,7 +128,9 @@
", deptClassCode='" + deptClassCode + '\'' +
", personApplyGroupCode=" + personApplyGroupCode +
", deptApplyGroupCode=" + deptApplyGroupCode +
- ", isUsedFlag=" + isUsedFlag +
+ ", usedFlag=" + usedFlag +
+ ", personFields='" + personFields + '\'' +
+ ", deptFields='" + deptFields + '\'' +
'}';
}
}
--
Gitblit v1.9.3