Merge branch 'developer' into 'master'

修改bug

See merge request !12

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

@@ -74,14 +74,15 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
     public ServiceResponse<IndexDTO> getIndexDesc(Integer enterpriseId, String moduleId, String indexGroupName, String indexCode) {
 //        TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
         TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode, indexGroupName);
-        List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
-        if (CollectionUtils.isNotEmpty(list)) {
-            Integer indexId = list.get(0);
-            TabIndex index = this.indexService.getByIndexId(indexId);
-            return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(IndexDTO.class, index));
-        } else {
-            return EnterpriseServiceResponse.success();
+        if (indexDesc != null) {
+            List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
+            if (CollectionUtils.isNotEmpty(list)) {
+                Integer indexId = list.get(0);
+                TabIndex index = this.indexService.getByIndexId(indexId);
+                return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(IndexDTO.class, index));
+            }
         }
+        return EnterpriseServiceResponse.success();
     }
 
     @Override