zqy
16 小时以前 31b53ed4e328090798dae35cecc9f5a60cdccd67
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -87,8 +87,14 @@
                .isNull(ZfEquipment::getIsHide)
            );
        }
        if (zfEquipment.getHasAttachment() != null && zfEquipment.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        if (zfEquipment.getHasAttachment() != null) {
            if (zfEquipment.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }
        }
//        lqw.in(StringUtils.isNotEmpty(zfEquipment.getCompanionList()),zfEquipment::getCompanion,zfEquipment.getCompanionList());
//        if (zfEquipment.getYear() != 0) {
@@ -109,7 +115,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);
                }
            }