需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyLogic.java

@@ -9,9 +9,11 @@ import com.gree.mall.manager.bean.policy.PolicyVo;
 import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.Policy;
 import com.gree.mall.manager.plus.entity.PolicyRange;
 import com.gree.mall.manager.plus.entity.PolicyWebsit;
+import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.PolicyRangeService;
 import com.gree.mall.manager.plus.service.PolicyService;
 import com.gree.mall.manager.plus.service.PolicyWebsitService;
@@ -41,6 +43,9 @@ public class PolicyLogic {
     @Autowired
     PolicyWebsitService policyWebsitService;
 
+    @Autowired
+    AdminWebsitService adminWebsitService;
+
 
 
     public IPage<PolicyVo> list(Page page, ZfireParamBean zfireParam) {
@@ -90,7 +95,13 @@ public class PolicyLogic {
         }
 
         for (PolicyWebsit policyWebsit : policyDetail.getPolicyWebsits()) {
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(policyWebsit.getWebsitId());
+
             policyWebsit.setPolicyId(policyDetail.getId());
+            policyWebsit.setWebsitName(adminWebsit.getName());
+            policyWebsit.setBelongCompany(adminWebsit.getBelongCompany());
+            policyWebsit.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
         }
 
 
@@ -115,7 +126,12 @@ public class PolicyLogic {
         }
 
         for (PolicyWebsit policyWebsit : policyDetail.getPolicyWebsits()) {
+            AdminWebsit adminWebsit = adminWebsitService.getById(policyWebsit.getWebsitId());
+
             policyWebsit.setPolicyId(policyDetail.getId());
+            policyWebsit.setWebsitName(adminWebsit.getName());
+            policyWebsit.setBelongCompany(adminWebsit.getBelongCompany());
+            policyWebsit.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
         }