From d039b89816988e6bed65ac7e5892d12df3e5e604 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 六月 2024 14:12:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
index 8f6f784..736f373 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
@@ -395,15 +395,16 @@
*/
public boolean checkDataSecret(BaseModel baseModel) throws VciBaseException{
VciBaseUtil.alertNotNull(baseModel,"瑕佹牎楠屽瘑绾х殑鏁版嵁瀵硅薄");
- if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
- if (baseModel.getSecretGrade() == null ) {
- baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
- }
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- if (!checkUserSecret(baseModel.getSecretGrade())) {
- throw new VciBaseException("褰撳墠鐢ㄦ埛鐨勫瘑绾т綆浜庢暟鎹殑瀵嗙骇锛岀敤鎴峰瘑绾т负" + UserSecretEnum.getSecretText(userSecret) + ",鏁版嵁瀵嗙骇涓�" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
- }
- }
+ //todo 鐧诲綍杩樻湭鍚敤锛屾墍浠ュ瘑绾ф棤娉曡幏鍙栭渶瑕佷慨鏀�
+// if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
+// if (baseModel.getSecretGrade() == null ) {
+// baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
+// }
+// Integer userSecret = VciBaseUtil.getCurrentUserSecret();
+// if (!checkUserSecret(baseModel.getSecretGrade())) {
+// throw new VciBaseException("褰撳墠鐢ㄦ埛鐨勫瘑绾т綆浜庢暟鎹殑瀵嗙骇锛岀敤鎴峰瘑绾т负" + UserSecretEnum.getSecretText(userSecret) + ",鏁版嵁瀵嗙骇涓�" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
+// }
+// }
return true;
}
--
Gitblit v1.9.3