From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 63afab9..f0024a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -76,6 +76,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ hiddenDanger.setMemberId(hiddenDanger.getLoginUserInfo().getMemberId());
hiddenDanger.setIsdeleted(Constants.ZERO);
hiddenDanger.setCreateDate(new Date());
hiddenDanger.setEditDate(new Date());
@@ -109,7 +110,7 @@
hiddenDangerLog.setObjType(Constants.ZERO);
hiddenDangerLogMapper.insert(hiddenDangerLog);
- List<Multifile> multifiles = hiddenDanger.getMultifileList();
+ List<Multifile> multifiles = hiddenDanger.getSubmitFileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)){
for (int i = 0; i < multifiles.size(); i++) {
Multifile multifile = multifiles.get(i);
@@ -122,11 +123,11 @@
multifileMapper.insert(multifile);
}
}
- String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname();
+ String title = "銆愰殣鎮ｉ殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname();
//json鏁版嵁
Map<String,Object> jsonMap = new HashMap<>();
- jsonMap.put("name", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());
- jsonMap.put("name", "闅愭偅绫诲瀷:" + hiddenDangerCate.getName());
+ jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());
+ jsonMap.put("cate", "闅愭偅绫诲瀷:" + hiddenDangerCate.getName());
jsonMap.put("sTime", "鍙戠幇鏃堕棿:" + DateUtil.DateToStr(hiddenDanger.getSubmitTime() , "yyyy-MM-dd HH:mm"));
//榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
Notices createNotices = new Notices();
@@ -442,7 +443,7 @@
isTrue = true;
}
}
- if(isTrue){
+ if(!isTrue){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
}
}
--
Gitblit v1.9.3