From 04767771fef0087b94158c618ed5fa1dd6852c80 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 14 十一月 2024 15:35:27 +0800
Subject: [PATCH] 用户密级字段未设置上问题修改
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 5 +++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 52db307..3937a19 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,6 +1,6 @@
package com.vci.frameworkcore.compatibility.impl;
-import com.vci.client.common.providers.ClientServiceProvider;
+import com.vci.common.utility.ObjectUtility;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.RoleInfo;
import com.vci.corba.framework.data.UserLogonInfo;
@@ -43,7 +43,6 @@
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.formula.functions.T;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1317,6 +1316,7 @@
}
smUserDTO.setCreator(loginUserId);
smUserDTO.setLastModifier(loginUserId);
+ smUserDTO.setOid(ObjectUtility.getNewObjectID36());
UserInfo userInfo = changeSmUserDTOToUserInfo(smUserDTO);
UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserId, "");
String oid = platformClientUtil.getFrameworkService().saveUser(userInfo, userEntityInfo);
@@ -1452,6 +1452,7 @@
userInfo.updateUser = user.getLastModifier() == null ? "" : user.getLastModifier();
userInfo.pwdUpdateTime = user.getPwdUpdateTime().getTime();
userInfo.grantor = user.getGrantor() == null ? "" : user.getGrantor();
+ userInfo.secretGrade = user.getSecretGrade() == null ? 2 : Integer.valueOf(user.getGrantor());
userInfo.isDeptLeader = user.getIsDeptLeader() == null ? "0" : user.getIsDeptLeader();
return userInfo;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index c4ba024..f5a32e1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -122,6 +122,7 @@
throw new PLException("500", new String[]{"澧炲姞涓氬姟绫诲瀷鏌ヨ妯℃澘澶辫触"});
}
}
+
/**
* 淇敼鏌ヨ妯℃澘
* @param qtd 鏌ヨ妯℃澘瀹炰綋绫�
@@ -161,6 +162,7 @@
return BaseResult.fail("鍒犻櫎鏌ヨ妯℃澘澶辫触");
}
}
+
/**
* @param qtInfoDTO 浼犺緭鐨勬暟鎹璞★細
* linkTypeName 閾炬帴绫诲瀷銆�
@@ -787,6 +789,7 @@
}
return ciMap;
}
+
/**
* 鏍戝寲涓�涓煡璇㈡潯浠剁粍鑺傜偣
* @param children
@@ -859,6 +862,7 @@
}
return ciList;
}
+
/**
* 楂樼骇鏌ヨ
* 鎶奛ode鍐呭瑙ｆ瀽鎴怌onditionItem
@@ -944,8 +948,6 @@
return ci;
}
-
-
/**
* 鑾峰彇鍙傜収鐨勬煡璇㈡ā鏉�
* @param refAbName: 鍙傜収灞炴�у悕
@@ -1004,7 +1006,6 @@
condition.setCIMap(ciMap);
return qt;
}
-
/**
* 杩斿洖鏌ヨ鐨勭増鏈�
@@ -1086,6 +1087,7 @@
ControllerUtil.writeFileToResponse(response,vciqtmfFileName);
FileUtil.del(defaultTempFolder + File.separator);
}
+
/**
* 瀵煎叆閾炬帴绫诲瀷鏌ヨ妯℃澘
* @param file 涓婁紶鐨勬枃浠�
@@ -1653,6 +1655,7 @@
tree.put("children", childList);
return BaseResult.success(tree);
}
+
/**
* 鏌ヨ妯℃澘鐨勫垪琛ㄦ坊鍔犱簡瀛楁鐨勭浉鍏冲睘鎬�
* @param btmName 绫诲瀷
@@ -1853,6 +1856,7 @@
e.printStackTrace();
}
}
+
// 鏁版嵁杩囨护
private void addImportBtmData(BtmQTExportData qtExportData, List<BizType> ltsNew, List<QTInfo> qTWrapperNew,
Map<String/* 绫诲瀷鍚嶇О */, QTD[]/* 鏌ヨ妯℃澘瀹氫箟 */> norepQTDs) {
--
Gitblit v1.9.3