Merge remote-tracking branch 'origin/dev_v2' into dev_v2

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TpAreaElevatorModelParaServiceImpl.java

@@ -658,7 +658,7 @@ public class TpAreaElevatorModelParaServiceImpl implements ITpAreaElevatorModelP
                     .findFirst()
                     .get();
             //查询当前参数下的所有选项,并按照value分组
-            Map<String, List<ParaSelectItemVo>> valueMap = allList.stream().filter(it-> item.getParaCode().equals(item.getParaCode()))
+            Map<String, List<ParaSelectItemVo>> valueMap = allList.stream().filter(it-> item.getParaCode().equals(it.getParaCode()))
                     .collect(Collectors.groupingBy(ParaSelectItemVo::getValue));
 
             //如果存在选项数据

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/TpParaSelectItemMapper.xml

@@ -213,14 +213,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectTpParaSelectItemWithCodeList" parameterType="com.ruoyi.project.business.domain.vo.paramSelectItem.ParaSelectItemVo" resultMap="ParaSelectItemResult">
-        select sel.id,
+        select
+        sel.id,
         para_id,
         value,
         label,
         labelUS,
         labelRU,
         labelES,
-        sel.para_code,
+        lib.para_code,
         para_name
          from tp_para_select_item sel
          left join tp_para_library lib on lib.id = sel.para_id