Merge branch 'developer' into 'master'

Developer

See merge request !74

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -113,7 +113,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
     public ServiceResponse<List<IndexDescDTO>> listAllUnRel(String moduleIds) {
         List<String> relModuleIdList = indexModuleRelService.listRelModuleId(LogAndUpdateTipsTypeEnum.INDEX.getCode());
         List<Integer> notInIndexDescIdList = Optional.of(relModuleIdList).orElse(Collections.emptyList())
-                .stream().map(Integer::valueOf).collect(Collectors.toList());
+                .stream().filter(StringUtils::isNotBlank).map(Integer::valueOf).collect(Collectors.toList());
 
         List<TabIndexDesc> indexDescList = this.indexDescService.listAllUnRel(notInIndexDescIdList);
 

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -234,10 +234,11 @@
   <select id="getIndexDescByIndexCode" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
+    from tab_index_desc where module_id = #{moduleId} and index_code = #{indexCode}
     <if test="indexGroupName != null and indexGroupName != '' ">
         and index_group_name = #{indexGroupName}
     </if>
+    order create_time
     limit 1
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabIndexModuleRelMapper.xml

@@ -183,7 +183,7 @@
   <select id="listModuleIdByBusinessIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_module_rel where status = 1 and type = #{type}
+    from tab_index_module_rel where type = #{type}
     <if test="null != ids and ids.size > 0">
       and business_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">