【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -331,7 +331,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
                 vo.setProvince(entity.getProvince());
                 vo.setProvince(entity.getProvince());
                 vo.setCity(entity.getCity());
                 vo.setCity(entity.getCity());
                 vo.setDistrict(entity.getDistrict());
                 vo.setDistrict(entity.getDistrict());
-                vo.setCompanyAddress(String.format("%s/%s/%s",vo.getProvince(),vo.getCity(),vo.getDistrict()));
+                //vo.setCompanyAddress(String.format("%s/%s/%s",vo.getProvince(),vo.getCity(),vo.getDistrict()));
                 if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
                 if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
                     ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
                     ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
                 }
                 }
@@ -355,22 +355,21 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         if(array.size() == 0){
         if(array.size() == 0){
             return null;
             return null;
         }
         }
-        List<TenantLicRQVO> list = new ArrayList<>();
+        JSONArray itemArray = new JSONArray();
         for(int i = 0; i < array.size(); i++){
         for(int i = 0; i < array.size(); i++){
             JSONObject obj = array.getJSONObject(i);
             JSONObject obj = array.getJSONObject(i);
-            TenantLicRQVO item = new TenantLicRQVO();
-            item.setLicenseType("1");
-
             //格式转换
             //格式转换
             JSONObject itemOjb = new JSONObject();
             JSONObject itemOjb = new JSONObject();
-            JSONArray itemArray = new JSONArray();
             itemOjb.put("name",obj.get("name"));
             itemOjb.put("name",obj.get("name"));
             itemOjb.put("path",obj.get("url"));
             itemOjb.put("path",obj.get("url"));
             itemArray.add(itemOjb);
             itemArray.add(itemOjb);
-            item.setPictContentJson(JSON.toJSONString(itemArray));
-
-            list.add(item);
         }
         }
+        TenantLicRQVO item = new TenantLicRQVO();
+        item.setLicenseType("1");
+        item.setPictContentJson(JSON.toJSONString(itemArray));
+
+        List<TenantLicRQVO> list = new ArrayList<>();
+        list.add(item);
         return list;
         return list;
     }
     }