Commit 5aec60e7 authored by gaoyingwei's avatar gaoyingwei

update:更新上传附件

parent dd7ebaa0
...@@ -484,8 +484,8 @@ public class FileManagerImpl implements FileManager { ...@@ -484,8 +484,8 @@ public class FileManagerImpl implements FileManager {
//TODO: 配置组件完成后,释放下行注释 //TODO: 配置组件完成后,释放下行注释
encryptVersion = CoderFactory.getInstance().getEncryptVersion(); encryptVersion = CoderFactory.getInstance().getEncryptVersion();
String level = request.getParameter("secretLevel"); String level = request.getParameter("secretLevel");
if (level.equals("4") || level.equals("5")) {
if (encryptVersion != null && !IConfigPublicKey.NO.equals(encryptVersion) && ! "false".equals(isEncrypt)) { // 统一由系统开关配置控制,除非模块设置成false不要求加密 if (encryptVersion != null && !IConfigPublicKey.NO.equals(encryptVersion) && ! "false".equals(isEncrypt)) { // 统一由系统开关配置控制,除非模块设置成false不要求加密
if (StringUtils.isBlank(level) || level.equals("4") || level.equals("5") ) {
bos = new BufferedOutputStream(new FileOutputStream(destFile)); bos = new BufferedOutputStream(new FileOutputStream(destFile));
CoderFactory.getInstance().upload(fi.getInputStream(), bos, encryptVersion); CoderFactory.getInstance().upload(fi.getInputStream(), bos, encryptVersion);
} }
...@@ -494,6 +494,8 @@ public class FileManagerImpl implements FileManager { ...@@ -494,6 +494,8 @@ public class FileManagerImpl implements FileManager {
} }
//文件加标 //文件加标
Integer secretLevel = colManager.selectMemberSecretLevel(AppContext.getCurrentUser().getId()); Integer secretLevel = colManager.selectMemberSecretLevel(AppContext.getCurrentUser().getId());
if (StringUtils.isNotBlank(level) && (level.equals("1") || level.equals("2") || level.equals("3"))) {
//判断人员密集 //判断人员密集
if (!(((secretLevel.equals(1)||secretLevel.equals(5))&&(Integer.parseInt(level)>=4)) || if (!(((secretLevel.equals(1)||secretLevel.equals(5))&&(Integer.parseInt(level)>=4)) ||
(secretLevel.equals(2)&&Integer.parseInt(level)>=3) || (secretLevel.equals(3)&&Integer.parseInt(level)>=2))){ (secretLevel.equals(2)&&Integer.parseInt(level)>=3) || (secretLevel.equals(3)&&Integer.parseInt(level)>=2))){
...@@ -501,7 +503,6 @@ public class FileManagerImpl implements FileManager { ...@@ -501,7 +503,6 @@ public class FileManagerImpl implements FileManager {
throw new BusinessException("文件密级标志大于人员密级"); throw new BusinessException("文件密级标志大于人员密级");
} }
if (level.equals("1") || level.equals("2") || level.equals("3")) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String date = sdf.format(new Date()); String date = sdf.format(new Date());
int secrecyLevel = 5; int secrecyLevel = 5;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment