智库检索

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

@@ -808,20 +808,14 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
                 queryWrapper.and(wreapper->{
                     wreapper.like("chinese_whole",vo.getKeyword());
                     wreapper.or();
-                    wreapper.like("chinese_simple",vo.getKeyword());
-                    wreapper.or();
                     wreapper.like("english_whole",vo.getKeyword());
                     wreapper.or();
-                    wreapper.like("english_simple",vo.getKeyword());
-                    wreapper.or();
                     wreapper.like("tag_name",vo.getKeyword());
                     wreapper.or();
                     wreapper.like("belong_country",vo.getKeyword());
-                    wreapper.or();
-                    wreapper.like("biographical_notes",vo.getKeyword());
                 });
             }
-            if(fieldTypeId!=null && fieldTypeId.size()>0){
+            if(fieldTypeId!=null && fieldTypeId.size()>0 && StringUtils.isNotBlank(fieldTypeId.get(0))){
                 queryWrapper.and(wreapper->{
                     for(int i=0;i<fieldTypeId.size();i++){
                         wreapper.like("tag_id",fieldTypeId.get(i));