添加站点业务中子业务列表

base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java

 package com.mortals.xhx.module.site.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 import lombok.Data;
 
@@ -17,6 +18,8 @@ public class SiteBusinessVo extends BaseEntityLong {
     /** 子站点事项 */
     private List<SiteBusinessEntity> children = new ArrayList<>();
 
+    private List<BusinessEntity> businessChildren = new ArrayList<>();
+
     /**
      * 备注
      */

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java

@@ -54,12 +54,19 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
         if (!ObjectUtils.isEmpty(item.getBusinessId())) {
             BusinessEntity businessEntity = businessService.get(item.getBusinessId());
             if (!ObjectUtils.isEmpty(businessEntity)) {
-                BeanUtils.copyProperties(businessEntity, item, "id");
+                item.setFlownum(businessEntity.getFlownum());
+                item.setCanorder(businessEntity.getCanorder());
+                item.setCantake(businessEntity.getCantake());
+                item.setDatashow(businessEntity.getDatashow());
+                item.setEnglishname(businessEntity.getEnglishname());
+                item.setBusinessType(businessEntity.getBusinessType());
                 //判断业务是否含有子业务
                 if (businessEntity.getIsBusiness() == IsBusinessEnum.一级业务.getValue()) {
                     //添加二级业务列表
                     List<BusinessEntity> businessEntities = businessService.find(new BusinessQuery().parentId(businessEntity.getId()));
-                    businessEntity.setChildren(businessEntities);
+                    if(!ObjectUtils.isEmpty(businessEntities)){
+                        item.setBusinessChildren(businessEntities);
+                    }
                 }
             }
         }

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

 {
-  "local1": {
+  "base-local": {
     "baseUrl": "http://127.0.0.1:17211/zwfw"
   },
-  "dev": {
+  "base-dev": {
     "baseUrl": "http://192.168.0.217:17311/zwfw"
   },
-  "test2": {
+  "base-test": {
     "baseUrl": "http://192.168.0.98:11071/zwfw"
   }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http

 
 ###站点业务列表
 POST {{baseUrl}}/site/business/list
+Authorization: {{authToken}}
 Content-Type: application/json
 
 {

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -18,7 +18,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###首页
 POST {{baseUrl}}/login/index
-Authorization: Bearer  {{authToken}}
+Authorization: {{authToken}}
 Content-Type: application/json
 
 {}