Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-api/src/main/java/com/gic/cloud/service/DataExplainApiService.java

@@ -95,5 +95,5 @@ public interface DataExplainApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDTO>>
      * @throws 
      */
-    ServiceResponse<List<DataExplainDTO>> listByModule(String moduleId);
+    ServiceResponse<DataExplainDTO> listByModule(String moduleId);
 }

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

@@ -15,6 +15,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -119,10 +120,14 @@ public class DataExplainApiServiceImpl implements DataExplainApiService {
     }
 
     @Override
-    public ServiceResponse<List<DataExplainDTO>> listByModule(String moduleId) {
+    public ServiceResponse<DataExplainDTO> listByModule(String moduleId) {
         DataExplainQO dataExplainQO = new DataExplainQO();
         dataExplainQO.setModuleId(moduleId);
         List<TabDataExplain> dataExplainList = dataExplainService.listAllDataExplain(dataExplainQO);
-        return EnterpriseServiceResponse.success(EntityUtil.changeEntityListByJSON(DataExplainDTO.class, dataExplainList));
+        if (CollectionUtils.isNotEmpty(dataExplainList)) {
+            return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(DataExplainDTO.class, dataExplainList.get(0)));
+        } else {
+            return EnterpriseServiceResponse.success();
+        }
     }
 }

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

@@ -234,6 +234,10 @@
   <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} and index_group_name = #{indexGroupName} limit 1
+    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
+    <if test="indexGroupName != null and indexGroupName != '' ">
+        and index_group_name = #{indexGroupName}
+    </if>
+    limit 1
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexDescController.java

@@ -75,7 +75,7 @@ public class IndexDescController {
 
     @RequestMapping("/get-data-explain")
     public RestResponse getDataExplain(String moduleId) {
-        ServiceResponse<List<DataExplainDTO>> serviceResponse = dataExplainApiService.listByModule(moduleId);
+        ServiceResponse<DataExplainDTO> serviceResponse = dataExplainApiService.listByModule(moduleId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 }
\ No newline at end of file