Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -480,6 +480,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
             userIds.addAll(formDTO.getEpmetUserIdList());
         }
+        formDTO.setUserIds(userIds);
         //2、小程序内自己上报+赋能平台待录入的
         PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -97,7 +97,8 @@
             temp.LABEL
         from (
                  SELECT
-                     ( CASE WHEN M.ITEM_GROUP_ID = '0' THEN 'ic_resi_user' ELSE g.TABLE_NAME END ) AS table_name,
+                     ifnull(g.TABLE_NAME,'ic_resi_user') AS table_name,
+                     #( CASE WHEN M.ITEM_GROUP_ID = '0' THEN 'ic_resi_user' ELSE g.TABLE_NAME END ) AS table_name,
                      m.COLUMN_NAME AS columnName,
                      m.LABEL
                  FROM
@@ -158,4 +159,4 @@
         AND a.customer_id = #{customerId}
     </select>
 
-</mapper>
+</mapper>