From 1e3faa0837db3cfad3e4118865e5c2ceb703afe8 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <jiangxiaoming@seaskysh.com>
Date: Fri, 10 Jan 2025 11:12:21 +0800
Subject: [PATCH] 111

---
 .../application/command/EntryCommandServiceImpl.java        | 2 ++
 .../infrastructure/reader/FileQueryServiceImpl.java         | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
index 3bdcd16e..6ba6afe2 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
@@ -1304,6 +1304,7 @@ public class EntryCommandServiceImpl implements EntryCommandService {
             log.info("璋冪敤涓嬭浇鏂囦欢鎺ュ彛/FileInfo/DownLoadFileInfo璇锋眰鍙傛暟"+JSONObject.toJSONString(map));
             String ff = HttpClientUtil.doPostJson(url, JSONObject.toJSONString(map));
             JSONObject obj1 = JSONObject.parseObject(ff);
+            log.info("璋冪敤涓嬭浇鏂囦欢鎺ュ彛鍏ㄨ繑鍥瀌ata = "+obj1.toString());
             log.info("璋冪敤涓嬭浇鏂囦欢鎺ュ彛/FileInfo/DownLoadFileInfo杩斿洖"+obj1.getString("isSuccess")+",fileId = "+out.getFileId());
             filemap.clear();
             if (obj1.getString("isSuccess") == null || !"true".equals(obj1.getString("isSuccess"))) {
@@ -1317,6 +1318,7 @@ public class EntryCommandServiceImpl implements EntryCommandService {
                 continue; //娴嬭瘯鐜涓嬭浇涓嶄簡閾惰鍥炲崟
             }
             JSONArray data = obj1.getJSONArray("data");
+            log.info("璋冪敤涓嬭浇鏂囦欢鎺ュ彛杩斿洖data = "+data.toString());
             data.stream().filter(o -> o instanceof JSONObject)
                     .forEach(o -> {
                         JSONObject jsonObject = (JSONObject) o;
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/FileQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/FileQueryServiceImpl.java
index c7bd4ed6..1019d7ab 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/FileQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/FileQueryServiceImpl.java
@@ -47,9 +47,11 @@ public class FileQueryServiceImpl extends BaseControllerImpl implements FileQuer
     public List<FileOut> getFileListAndImage(FileQry qry) {
         QueryWrapper<ReturnFilePo> queryWrapper=new QueryWrapper<>();
         queryWrapper.in("income_id",qry.getIncomeId());
-        queryWrapper.in("file_type",qry.getFileType());
         queryWrapper.eq("available", Available.YES);
-        queryWrapper.or().like("file_extension", "image");
+        queryWrapper.and(wrapper -> wrapper.in("file_type", qry.getFileType()).or().like("file_extension", "image"));
+       // queryWrapper.in("file_type",qry.getFileType());
+       // queryWrapper.eq("available", Available.YES);
+       // queryWrapper.or().like("file_extension", "image");
         queryWrapper.last("order by create_date desc");
         List<ReturnFilePo> returnFilePos=returnFileMapper.selectList(queryWrapper);
         if(returnFilePos==null)
-- 
GitLab