forked from integrated_whb/integrated_whb
优化BUG
parent
0d7b34fe6e
commit
013dd6e242
|
@ -109,6 +109,11 @@ public class AppTrafficSafetyMeetingController extends BaseController {
|
|||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
|
||||
|
||||
if(pd.getString("LOCATIONADDRESS").contains("undefined")) {
|
||||
String localhost = pd.getString("LOCATIONADDRESS").replace("undefined","");
|
||||
pd.put("LOCATIONADDRESS", localhost);
|
||||
}
|
||||
|
||||
if (livePhoto != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
|
||||
String livePhotoPath = saveFile(livePhoto, pd);
|
||||
if (livePhotoPath != null) {
|
||||
|
|
|
@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.net.CacheRequest;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ public class TextLibraryServiceImpl implements TextLibraryService {
|
|||
String path = smb.saveFile(file[0]);
|
||||
condition.put("PATH", path);
|
||||
}
|
||||
if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID"))) {
|
||||
if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID")) && StringUtils.isEmpty(condition.getString("ISADD"))) {
|
||||
// 保存历史文件
|
||||
PageData entity = textlibraryMapper.findById(condition);
|
||||
condition.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH")));
|
||||
|
|
Loading…
Reference in New Issue