合并分支 'yjzx_dev' 到 'yjzx_test'

字典关联字典值

查看合并请求 !9

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

@@ -327,11 +327,21 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
             }
         }
         if(baseInfo!=null && StringUtils.isNotBlank(baseInfo.getLang())){
+            String langName = "";
+            for(String str:Arrays.asList(baseInfo.getLang().split(","))){
                 QueryWrapper query = new QueryWrapper();
-            query.eq("item_value",baseInfo.getLang());
+                query.in("item_value",str);
                 List<SysDictItem> sysDictItemList = sysDictItemService.list(query);
                 if(sysDictItemList!=null && sysDictItemList.size()>0){
-                baseInfo.setLangName(sysDictItemList.get(0).getItemText());
+                    if(langName.equals("")){
+                        langName = sysDictItemList.get(0).getItemText();
+                    }else{
+                        langName = langName  + "," + sysDictItemList.get(0).getItemText();
+                    }
+                }
+            }
+            if(!langName.equals("")){
+                baseInfo.setLangName(langName);
             }
         }
     }