Просмотр исходного кода

批量下载,在文件名后+时间戳或存储名称,防止文件名相同只下载单个

user5 4 лет назад
Родитель
Сommit
5bf75eb003

+ 7 - 5
src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -896,12 +896,14 @@ public class WorkFullManageController extends BaseController {
 		//咨询类别
 		data.put("consultType",consultType);
 		//委托单位
-		if (null != workContractInfo.getClient()) {
-			data.put("entrustUnit",workContractInfo.getClient().getName());
-		}else{
-			data.put("entrustUnit","");
+		if(null != workContractInfo){
+			if (null != workContractInfo.getClient()) {
+				data.put("entrustUnit",workContractInfo.getClient().getName());
+			}else{
+				data.put("entrustUnit","");
+			}
+			data.put("contractNumber",workContractInfo.getContractNum());
 		}
-		data.put("contractNumber",workContractInfo.getContractNum());
 		//约定作业期
 		data.put("promiseTime",promiseTime);
 		data.put("projectMaster",ruralProjectRecords.getLeaderNameStr());