修改人物搜索bug

zqy

22 小时以前 31b53ed4e328090798dae35cecc9f5a60cdccd67

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java

@@ -93,9 +93,13 @@
                .isNull(ZfCollection::getIsHide)
            );
        }
        if (zfCollection.getHasAttachment() != null && zfCollection.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (zfCollection.getHasAttachment() != null) {
            if (zfCollection.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(zfCollection.getCompanionList()),zfCollection::getCompanion,zfCollection.getCompanionList());
//        if (zfCollection.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfCollection.getYear());
@@ -115,7 +119,7 @@
            if (!companionList.isEmpty()) {
                // 确保所有参与人都在companion字段中
                for (String companion : companionList) {
                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '，', ',')) > 0",
                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(REPLACE(people, ' ', ''), '，', ','),';',',')) > 0",
                        companion);
                }
            }
@@ -729,7 +733,7 @@
            zfEventdto atd = new zfEventdto();
            atd.setId(Math.toIntExact(obj.getId()));
            atd.setModule("收藏");
            atd.setName(obj.getCompanion());
            atd.setName(obj.getOwner());
            atd.setCreateTime(obj.getCreateTime());
            daoRes.add(atd);
        }