From cabf2cffb64e98401d87c2e03537720390e2f4ea Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 05 九月 2024 10:01:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/com/yc/action/upload/AttachmentAction.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/com/yc/action/upload/AttachmentAction.java b/src/com/yc/action/upload/AttachmentAction.java
index 6a451d5..ae3d2aa 100644
--- a/src/com/yc/action/upload/AttachmentAction.java
+++ b/src/com/yc/action/upload/AttachmentAction.java
@@ -1339,6 +1339,7 @@
}
String doccode = request.getParameter("doccode");
String fieldid = (String) request.getParameter("fieldid");
+ if(fieldid==null) fieldid="";//閬垮厤app涓婁紶澶村儚鏃舵姤閿�
String rowid = (String) request.getParameter("rowid");
String uuid = (String) request.getParameter("uuid");
@@ -1492,7 +1493,8 @@
str_formid = postBeanInfo.getFormid() + "";
}
String doccode = request.getParameter("doccode");
- String fieldid = request.getParameter("fieldid");
+ String fieldid =request.getParameter("fieldid");
+ if(fieldid==null) fieldid="";//閬垮厤app涓婁紶澶村儚鏃舵姤閿�
String rowid = request.getParameter("rowid");
String uuid = request.getParameter("uuid");
String matCode=request.getParameter("matCode");//涓埆鏁版嵁娌℃湁doccode鍊奸渶瑕佸埌杩欎釜灞炴�� xin 2023-2-10 17:29:11
@@ -1659,10 +1661,9 @@
//鍏朵粬鎯呭喌涓嶆洿鏂�
} else {
//浠庤〃鏇存柊闇�瑕佹湁rowid, 閽堝5绫诲瀷,8绫诲瀷浠庤〃
- if (StringUtils.isBlank(postBeanInfo.getRowid())) {
- throw new ApplicationException(postBeanInfo.getFormid() + "鏇存柊鍗曞彿銆�" + postBeanInfo.getDoccode() + "銆戦檮浠朵俊鎭紝rowid涓嶈兘涓虹┖");
+ if (StringUtils.isNotBlank(postBeanInfo.getRowid())) {
+ baseService.getSimpleJdbcTemplate().update(" update a set a." + postBeanInfo.getFieldid() + "=? from " + tableName + " a where a.doccode=? and a.rowid=?", seqString, postBeanInfo.getDoccode(), postBeanInfo.getRowid());
}
- baseService.getSimpleJdbcTemplate().update(" update a set a." + postBeanInfo.getFieldid() + "=? from " + tableName + " a where a.doccode=? and a.rowid=?", seqString, postBeanInfo.getDoccode(), postBeanInfo.getRowid());
}
}
Map<String, String> m = new HashMap<String, String>();
--
Gitblit v1.8.0