Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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());

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,