From f83110fda5c18f659893ae489ee4fada08b5cc52 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Dec 2021 23:19:55 +0800
Subject: [PATCH 1/2] zancun

---
 .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index b3b746eff1..51988384c8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/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));

From b7a9f9c8b6cbf6fbffe7d9c408e4302c1b6f1320 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 8 Dec 2021 23:34:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E5=9B=BA=E5=AE=9A=E5=88=86?=
 =?UTF-8?q?=E7=BB=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcFormItemDao.xml              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index 61a1c155c9..c9b16fd11c 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/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>
\ No newline at end of file
+</mapper>