diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 6f81ec1c5..247ec651c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -237,7 +237,7 @@ public class BussDocumentLibraryEOController extends JeroController updateInfo(Map map) { + public Result updateInfo(@RequestBody Map map) { try { bussDocumentLibraryEOService.updateInfo(map); } catch (Exception e) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e0f2fbfeb..f911fbcdf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -325,50 +325,45 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); - //处理修改人和修改时间 - if ("update_by".equals(key)) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - value = sysUser.getUsername(); - } - if ("update_time".equals(key)) { - value = new Date(); - } - List fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - //处理时间类型 - if (fieldDate.size() != 0) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (ObjectUtils.isNotEmpty(value)) { - value = "str_to_date('" + sdf.format(value) + "','%Y-%m-%d %H:%i:%s')"; + if(ObjectUtils.isNotEmpty(value)){ + //处理修改人和修改时间 + if ("update_by".equals(key)) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + value = sysUser.getUsername(); } - valuesBuilder.append(value + ","); - } else { - //处理文件类型 - List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { + if ("update_time".equals(key)) { + value = new Date(); + } + List fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + //处理时间类型 + if (fieldDate.size() != 0) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (ObjectUtils.isNotEmpty(value)) { + value = "str_to_date('" + sdf.format(new Date()) + "','%Y-%m-%d %H:%i:%s')"; + } + valuesBuilder.append(value + ","); + } else { + //处理文件类型 + List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { - String valueTemp = UUID.randomUUID().toString().replace("-", ""); - value = valueTemp; - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : value.toString().split(",")) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); - ossFile.setConnectId(valueTemp); - oSSFileList.add(ossFile); + String valueTemp = UUID.randomUUID().toString().replace("-", ""); +// value = valueTemp; + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : value.toString().split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(valueTemp); + oSSFileList.add(ossFile); + } + iOSSFileService.updateFileInfo(oSSFileList); + valuesBuilder.append("'" + value + "'" + ","); + }else{ + valuesBuilder.append("'" + value + "'" + ","); } - iOSSFileService.updateFileInfo(oSSFileList); } - valuesBuilder.append("'" + value + "'" + ","); - } - fieldsBuilder.append(key + ","); - - //处理文件类型 - List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { - - String valueTemp = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - + fieldsBuilder.append(key + ","); } } String insertField = fieldsBuilder.substring(0, fieldsBuilder.length() - 1);