fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/impl/BsCovenantServiceImpl.java

@@ -113,6 +113,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                     bsCovenantBusiness.setEducationTypeName(iCourseEducationTypeService.getById(bsCovenantBusiness.getEducationTypeId()).getEducationName());
                     bsCovenantBusiness.setProjectName(iCourseProjectTypeService.getById(bsCovenantBusiness.getProjectId()).getProjectName());
                     BsCovenantGoodsQueryBo bsCovenantGoodsQueryBo = new BsCovenantGoodsQueryBo();
+                    bsCovenantGoodsQueryBo.setCovenantId(bsCovenantBusiness.getCovenantBusinessId());
                     bsCovenantGoodsQueryBo.setCovenantId(bsCovenantVo.getCovenantId());
                     bsCovenantGoodsQueryBo.setStatus(1);
                     List<BsCovenantGoodsVo> bsCovenantGoodsVos = iBsCovenantGoodsService.queryList(bsCovenantGoodsQueryBo);
@@ -176,7 +177,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
             newBsCovenant.setYiCompanyContract(bsCovenant1.getYiCompanyContract());
             newBsCovenant.setYiCompanyPhone(bsCovenant1.getYiCompanyPhone());
             newBsCovenant.setYiRecipients(bsCovenant.getYiRecipients());
-            newBsCovenant.setYiCompanyContract(bsCovenant.getYiCompanyContract());
+            newBsCovenant.setYiRecipientsAddress(bsCovenant.getYiRecipientsAddress());
             newBsCovenant.setYiRecipientsPhone(bsCovenant.getYiRecipientsPhone());
             newBsCovenant.setYiRecipientsRemark(bsCovenant.getYiRecipientsRemark());
             return newBsCovenant;

zhongzheng-system/src/main/resources/mapper/modules/covenant/BsCovenantMapper.xml

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="proceedsAccount" column="proceeds_account"/>
     </resultMap>
 <select id="selectByCovenantId" parameterType="com.zhongzheng.modules.bs.covenant.bo.BsCovenantQueryBo" resultMap="BsCovenantVoResult">
-    select * from
+    select distinct bc.* from
         bs_covenant bc left join  bs_covenant_business bcb on bc.covenant_id=bcb.covenant_id
     left join bs_covenant_goods bcg on bcb.covenant_business_id=bcg.covenant_business_id where 1=1
     <if test="covenantId != null and covenantId !=''">