合并分支 'yjzx_dev' 到 'yjzx_test'

语言bug修改，英语简称查询

查看合并请求 !12

src/main/java/com/zzsn/thinktank/controller/SysDictItemController.java

@@ -75,6 +75,7 @@ public class SysDictItemController {
 				List<ThinktankBasicInfo> thinktankBasicInfo = thinktankBasicInfoService.list(queryThink);
 				// 使用 Stream API 遍历集合，过滤掉 lang 为 null 或空的元素，并收集剩余元素的 lang 字段，用英文逗号隔开
 				String langValues = thinktankBasicInfo.stream()
+						.filter(baseInfo->baseInfo!=null)
 						.map(ThinktankBasicInfo::getLang) // 提取 lang 字段
 						.filter(lang -> lang != null && !lang.isEmpty()) // 过滤掉 null 或空的值
 						.collect(Collectors.joining(",")); // 将结果用英文逗号连接起来

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

@@ -725,13 +725,15 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
             queryWrapper.eq("yn_display",1);//yjzx-是否展示到列表（0否 1是）
             if(StringUtils.isNotBlank(vo.getKeyword())){
                 queryWrapper.and(wreapper->{
-                    wreapper.like("chinese_whole",vo.getKeyword());
+                    wreapper.like("chinese_whole", vo.getKeyword());
                     wreapper.or();
-                    wreapper.like("english_whole",vo.getKeyword());
+                    wreapper.like("english_whole", vo.getKeyword());
                     wreapper.or();
-                    wreapper.like("tag_name",vo.getKeyword());
+                    wreapper.like("tag_name", vo.getKeyword());
                     wreapper.or();
-                    wreapper.like("belong_country",vo.getKeyword());
+                    wreapper.like("belong_country", vo.getKeyword());
+                    wreapper.or();
+                    wreapper.like("upper(english_simple)", vo.getKeyword().toUpperCase());
                 });
             }
             if(fieldTypeId!=null && fieldTypeId.size()>0 && StringUtils.isNotBlank(fieldTypeId.get(0))){