门店授权

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java

@@ -122,17 +122,19 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
         if(listStoreField.isSuccess()){
             List<StoreFieldDTO> list = listStoreField.getResult();
             List<String> listSelect = this.storeDictService.listStoreField(enterpriseId);
-            for(StoreFieldDTO tabStoreField : list){
-                StoreDictDTO storeDictDTO = new StoreDictDTO();
-                storeDictDTO.setKey(tabStoreField.getStoreFieldName());
-                storeDictDTO.setValue(tabStoreField.getStoreFieldId()+"");
-                storeDictDTO.setOwnType(tabStoreField.getOwnType());
-                for(String s : listSelect){
-                    if(tabStoreField.getStoreFieldId().intValue() == Integer.valueOf(s).intValue()){
-                        storeDictDTO.setChecked(1);
+            if(CollectionUtils.isNotEmpty(listSelect)){
+                for(StoreFieldDTO tabStoreField : list){
+                    StoreDictDTO storeDictDTO = new StoreDictDTO();
+                    storeDictDTO.setKey(tabStoreField.getStoreFieldName());
+                    storeDictDTO.setValue(tabStoreField.getStoreFieldId()+"");
+                    storeDictDTO.setOwnType(tabStoreField.getOwnType());
+                    for(String s : listSelect){
+                        if(tabStoreField.getStoreFieldId().intValue() == Integer.valueOf(s).intValue()){
+                            storeDictDTO.setChecked(1);
+                        }
                     }
+                    result.add(storeDictDTO);
                 }
-                result.add(storeDictDTO);
             }
         }
         return ServiceResponse.success(result);