Merge remote-tracking branch 'origin/master'
This commit is contained in:
+3
-2
@@ -111,8 +111,8 @@ public class LawsUserInfoService {
|
||||
onlineFileLog.setValidFlag("0");
|
||||
onlineFileLog.setFileKey(key);
|
||||
onlineFileLog.setFilePath(fileUrl);
|
||||
onlineFileLog.setDataType(dataType);
|
||||
onlineFileLog.setJxFileName(jxFileName);
|
||||
// onlineFileLog.setDataType(dataType);
|
||||
// onlineFileLog.setJxFileName(jxFileName);
|
||||
onlineFileLogDao.insert(onlineFileLog);
|
||||
log.info("======================日志存入成功===============================");
|
||||
if (StringUtils.isNotBlank(standName)) {
|
||||
@@ -121,6 +121,7 @@ public class LawsUserInfoService {
|
||||
log.info("======================文件名称修改成功===============================" + standName + ".docx" + "======" + "传入对象为:" + ossFile.getFileName());
|
||||
}
|
||||
QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapperHis = new QueryWrapper<>();
|
||||
onlineFileLogQueryWrapperHis.isNull("DATA_TYPE");
|
||||
onlineFileLogQueryWrapperHis.eq("HIS_ID", onlineFileId);
|
||||
onlineFileLogQueryWrapperHis.eq("VALID_FLAG", "0");
|
||||
onlineFileLogQueryWrapperHis.orderByAsc("CREATE_TIME");
|
||||
|
||||
Reference in New Issue
Block a user