From e1b100367818e21d33676109729dc44d1e0851e0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 10:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java    | 4 +++-
 .../src/main/resources/mapper/IcResiDemandDictDao.xml         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 3b46ccb3a8..3ef872f211 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
@@ -1073,7 +1073,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         queryWrapper.orderByDesc("WANT_SERVICE_TIME");
         queryWrapper.last("limit 5");
         queryWrapper.select("DISTINCT CATEGORY_CODE");
-        return baseDao.selectList(queryWrapper).stream().map(o->o.toString()).collect(Collectors.toList());
+        return baseDao.selectObjs(queryWrapper).stream().map(o->o.toString()).collect(Collectors.toList());
     }
 
     /**
@@ -1250,6 +1250,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public DemandRecId saveOrUpdateDemand(ReportDemandFormDTO formDTO) {
+        //需求内容走内容审核
+
         Date now = new Date();
         DemandRecId resultDto = new DemandRecId();
         resultDto.setDemandRecId(formDTO.getDemandRecId());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
index 37f21845e4..0358defecc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
@@ -259,7 +259,7 @@
     <!--    查询分类信息，限制未被禁用的 -->
     <select id="selectListByCodes" parameterType="map" resultType="com.epmet.dto.result.demand.DemandCategoryResDTO">
          select
-            ID,
+            ID as categoryId,
             CATEGORY_CODE,
             PARENT_CODE,
             CATEGORY_NAME,