From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 十一月 2024 09:30:50 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index a76e3db..ddec2d9 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -122,6 +122,14 @@
}
}
+ public interface DATAPERMISSION_TYPE{
+ public static final int all = 0;
+ public static final int departAndChild = 1;
+ public static final int departAndLeaf = 2;
+ public static final int depart = 3;
+ public static final int custom = 4;
+ public static final int self = -1;
+ }
/**
* 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪
@@ -726,7 +734,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ProjectRecord c : ProjectRecord.values()) {
+ for (MultiFile c : MultiFile.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -736,7 +744,7 @@
// 鏅�氭柟娉�
public static String getInfo(int index) {
- for (ProjectRecord c : ProjectRecord.values()) {
+ for (MultiFile c : MultiFile.values()) {
if (c.getKey() == index) {
return c.noteinfo;
}
@@ -1027,7 +1035,7 @@
public enum ApplyLogType {
UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",0),
- PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_RETURN(1, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}",0),
SIGNATURE(3, "浼佷笟绛剧珷","",0),
FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
@@ -1039,14 +1047,14 @@
COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",0),
PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",1),
CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷","",1),
CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",1),
CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","",1),
CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",1),
- CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟","",1),
+ CA_COMPANY_CLOSE(19, "鍏抽棴鐢宠","",1),
CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�","",1),
CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}",1),
CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
--
Gitblit v1.9.3