wenhongquan 3 месяцев назад
Родитель
Сommit
ea188a182e

+ 2 - 3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/TblEventServiceImpl.java

@@ -84,11 +84,10 @@ public class TblEventServiceImpl implements ITblEventService {
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblEvent::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblEvent::getExt2, bo.getExt2());
         if(params.get("lx")!=null){
-            lqw.apply(StringUtils.format(" ext2->'$.lx' = {}", params.get("lx").toString()));
+            lqw.apply(StringUtils.format(" ext2->'$.lx' like '%{}%'", params.get("lx").toString()));
         }
         if(params.get("key")!=null){
-            lqw.apply(StringUtils.format(" ext2->'$.lx' like '%{}%'", params.get("key").toString()));
-            lqw.like(true, TblEvent::getAddr, params.get("key").toString());
+            lqw.apply(StringUtils.format(" ext2->'$.lx' like '%{}%' or addr like '%{}%'", params.get("key").toString(), params.get("key").toString()));
         }
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
             TblEvent::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));