|
|
@@ -140,13 +140,18 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
|
|
|
}
|
|
|
//判断图片是否有删除
|
|
|
List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+hotel.getId()+"'");
|
|
|
- if (fileInfoList.size() != fileList.size()){
|
|
|
+
|
|
|
+ if (fileInfoList != null){
|
|
|
+ if (fileInfoList.size() != fileList.size()){
|
|
|
+ isOk = true;
|
|
|
+ }
|
|
|
+ }else {
|
|
|
isOk = true;
|
|
|
}
|
|
|
if (isOk){
|
|
|
Workflow workflow = new Workflow();
|
|
|
String id = String.valueOf(UUID.randomUUID());
|
|
|
- workflow.setLinkId(String.valueOf(hotel.getManagerId()));
|
|
|
+ workflow.setLinkId(String.valueOf(hotel.getId()));
|
|
|
workflow.setRemark(hotel.getRemark());
|
|
|
workflow.setCreateId(String.valueOf(hotel.getCreateId()));
|
|
|
workflow.setId(id);
|
|
|
@@ -161,7 +166,6 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
|
|
|
//将新修改的附件关联到流程id
|
|
|
for(FileInfo file : fileList){
|
|
|
file.setLinkId(id);
|
|
|
- file.setId(String.valueOf(UUIDUtil.generateID()));
|
|
|
fileService.insertFile(file);
|
|
|
}
|
|
|
hotel.setRemark(hotel1.getRemark());
|
lijie