Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -244,6 +244,7 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
      */
     @Override
     public List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId, List<String> list) {
+        if(CollectionUtils.isEmpty(list)) return null;
         return baseDao.selectDifficultyBaseInfo(customerId,list);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -407,7 +407,7 @@
         AND project.CUSTOMER_ID = #{customerId}
         <if test="null != list and list.size() != 0">
             <foreach collection="list" item="projectId" open="AND " separator=" AND " >
-                project.ID <![CDATA[<>]]> #{projectId}
+                project.ID = #{projectId}
             </foreach>
         </if>
     </select>