修改人物搜索bug

zqy

22 小时以前 31b53ed4e328090798dae35cecc9f5a60cdccd67

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

@@ -81,9 +81,22 @@
        lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
        lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
        lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
        if (zfEconomy.getHasAttachment() != null && zfEconomy.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");

        if (StringUtils.isNotEmpty(zfEconomy.getIsHide())) {

            lqw.and(wrapper -> wrapper
                .ne(ZfEconomy::getIsHide, "是")
                .or()
                .isNull(ZfEconomy::getIsHide)
            );
        }
        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());
@@ -103,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);
                }
            }
@@ -661,9 +674,12 @@
        String[] split = companion.split(",");
        List<String> list = Arrays.asList(split);

        System.out.println("[[[[[[[["+hasAttachment);
        zfEconomy.setCompanionList(list);
        zfEconomy.setHasAttachment(hasAttachment);
        zfEconomy.setIsHide("否");

        System.out.println("[[[[[[[["+zfEconomy);

        return dataList(zfEconomy);
    }