|
|
@@ -26,6 +26,8 @@ import com.yw.bpm.instance.model.TacheInstance;
|
|
|
import com.yw.bpm.instance.service.FlowService;
|
|
|
import com.yw.bpm.seal.dao.SealDao;
|
|
|
import com.yw.bpm.seal.model.SealInfo;
|
|
|
+import com.yw.bpm.system.dao.SystemDao;
|
|
|
+import com.yw.bpm.system.model.SystemFile;
|
|
|
import com.yw.bpm.system.util.JsonUtil;
|
|
|
import com.yw.core.clientImpl.model.ResultVo;
|
|
|
import com.yw.core.clientImpl.service.RequestAbs;
|
|
|
@@ -124,6 +126,7 @@ public class BpmClientFlowDetailAction extends RequestAbs {
|
|
|
FormSealInfoDao bpmFormSealDao = (FormSealInfoDao) cxt.getBean("bpmFormSealDao");
|
|
|
SealDao bpmSealDao = (SealDao) cxt.getBean("bpmSealDao");
|
|
|
UploadFileService uploadFileService = (UploadFileService) cxt.getBean("uploadFileService");
|
|
|
+ SystemDao bpmSystemDao = (SystemDao) cxt.getBean("bpmSystemDao");
|
|
|
String formId = "";
|
|
|
String formInsId = "";
|
|
|
Map<String, Object> fileMap = new HashMap<String, Object>();
|
|
|
@@ -219,9 +222,18 @@ public class BpmClientFlowDetailAction extends RequestAbs {
|
|
|
defaultValue = sealId;
|
|
|
} else {
|
|
|
SealInfo sealInfo = bpmSealDao.getSealInfoById(sealId);
|
|
|
- defaultValue = sealInfo.getSealFileId().getUniversalid();
|
|
|
- sealImgPath = sealInfo.getSealFileId().getPath();
|
|
|
- element.put("sealImgPath", sealImgPath);
|
|
|
+ if(sealInfo != null){
|
|
|
+ defaultValue = sealInfo.getSealFileId().getUniversalid();
|
|
|
+ sealImgPath = sealInfo.getSealFileId().getPath();
|
|
|
+ element.put("sealImgPath", sealImgPath);
|
|
|
+ }else{
|
|
|
+ defaultValue = sealId;
|
|
|
+ SystemFile infoPathFile = bpmSystemDao.getFileInfoById(sealId);
|
|
|
+ if(infoPathFile != null){
|
|
|
+ sealImgPath = infoPathFile.getPath();
|
|
|
+ element.put("sealImgPath", sealImgPath);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|