修改人物搜索bug

zqy

16 小时以前 31b53ed4e328090798dae35cecc9f5a60cdccd67

修改人物搜索bug

 ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java

@@ -36,6 +36,7 @@
                        "localhost",
                        8087,


                    "http"

                )

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

@@ -108,9 +108,13 @@
                .isNull(ZfProperty::getIsHide)
            );
        }
        if (zfProperty.getHasAttachment() != null && zfProperty.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (zfProperty.getHasAttachment() != null) {
            if (zfProperty.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(zfEconomy.getCompanionList()),ZfEconomy::getCompanion,zfEconomy.getCompanionList());
//        if (zfEconomy.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
@@ -130,7 +134,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);
                }
            }

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

@@ -237,9 +237,13 @@
                .isNull(TravelCount::getIsHide)
            );
        }
        if (travelCount.getHasAttachment() != null && travelCount.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (travelCount.getHasAttachment() != null) {
            if (travelCount.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(travelCount.getCompanionList()),travelCount::getCompanion,travelCount.getCompanionList());
//        if (travelCount.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+travelCount.getYear());
@@ -259,7 +263,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);
                }
            }

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

@@ -92,9 +92,13 @@
                .isNull(ZfClean::getIsHide)
            );
        }
        if (zfClean.getHasAttachment() != null && zfClean.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (zfClean.getHasAttachment() != null) {
            if (zfClean.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(zfClean.getCompanionList()),zfClean::getCompanion,zfClean.getCompanionList());
//        if (zfClean.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfClean.getYear());
@@ -114,7 +118,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);
                }
            }

 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(owner, ' ', ''), '，', ',')) > 0",
                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(REPLACE(people, ' ', ''), '，', ','),';',',')) > 0",
                        companion);
                }
            }

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

@@ -475,10 +475,13 @@
                .isNull(ZfDoctor::getIsHide)
            );
        }
        if (zfDoctor.getHasAttachment() != null && zfDoctor.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }//        lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());

        if (zfDoctor.getHasAttachment() != null) {
            if (zfDoctor.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
        if (CollectionUtils.isNotEmpty(zfDoctor.getCompanionList())) {
            List<String> companionList = zfDoctor.getCompanionList();

@@ -492,7 +495,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);
                }
            }

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

@@ -90,9 +90,13 @@
                .isNull(ZfEconomy::getIsHide)
            );
        }
        if (zfEconomy.getHasAttachment() != null && zfEconomy.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (zfEconomy.getHasAttachment() != null) {
            if (zfEconomy.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(zfEconomy.getCompanionList()),ZfEconomy::getCompanion,zfEconomy.getCompanionList());
//        if (zfEconomy.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
@@ -112,7 +116,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);
                }
            }

 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);
                }
            }

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

@@ -85,8 +85,14 @@
                    lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());

        }
        if (zfEvent.getHasAttachment() != null && zfEvent.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        if (zfEvent.getHasAttachment() != null) {
            if (zfEvent.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }

        }
//        lqw.in(StringUtils.isNotEmpty(ZfEvent.getCompanionList()),ZfEvent::getCompanion,ZfEvent.getCompanionList());
//        if (ZfEvent.getYear() != 0) {
@@ -107,8 +113,9 @@
            if (!companionList.isEmpty()) {
                // 确保所有参与人都在companion字段中
                for (String companion : companionList) {
                    System.out.println("[[[[["+companion);
                    lqw.apply(
                        "FIND_IN_SET({0}, REPLACE(REPLACE(people, ' ', ''), '，', ',')) > 0",
                        "FIND_IN_SET({0}, REPLACE(REPLACE(REPLACE(people, ' ', ''), '，', ','),';',',')) > 0",
                        companion);
                }
            }
@@ -677,7 +684,9 @@
        zfEvent.setHappenEndTime(happenEndTime);

        System.out.println("--------------"+companion+"-----------------");
        String[] split = companion.trim().replace(" ", "").replace("，", ",").split(",");
        String[] split = companion.trim().replace(" ", "").replace("，", ",").replace(";",",").split(",");

        System.out.println(Arrays.toString(split));
        List<String> list = Arrays.asList(split);

        zfEvent.setCompanionList(list);

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

@@ -385,9 +385,13 @@
                .isNull(ZfPet::getIsHide)
            );
        }
        if (zfPet.getHasAttachment() != null && zfPet.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
        if (zfPet.getHasAttachment() != null) {
            if (zfPet.getHasAttachment().equals("是")) {
                lqw.apply("url IS NOT NULL AND url != ''");
            }
            else {
                lqw.apply("(url IS NULL OR url = '')");
            }        }
//        lqw.in(StringUtils.isNotEmpty(zfPet.getCompanionList()),zfPet::getCompanion,zfPet.getCompanionList());
//        if (zfPet.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfPet.getYear());
@@ -407,7 +411,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);
                }
            }