测试问题修复

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java

@@ -4,10 +4,13 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.common.log.enums.OperaType;
+import com.bonus.material.basic.domain.BmUnitPerson;
+import com.bonus.material.basic.service.IBmUnitPersonService;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.ma.service.ITypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +47,9 @@ public class BmUnitController extends BaseController
     @Autowired
     private ITypeService typeService;
 
+    @Autowired
+    private IBmUnitPersonService bmUnitPersonService;
+
     /**
      * 查询往来单位管理列表
      */
@@ -69,7 +75,11 @@ public class BmUnitController extends BaseController
     {
         Long deptId = typeService.getUserDeptId();
         bmUnit.setCompanyId(deptId);
-        List<BmUnit> list = bmUnitService.selectBmUnitList(bmUnit);
+      //  List<BmUnit> list = bmUnitService.selectBmUnitList(bmUnit);
+        BmUnitPerson  bmUnitPerson = new BmUnitPerson();
+        bmUnitPerson.setCompanyId(deptId+"");
+        BeanUtils.copyProperties(bmUnit, bmUnitPerson);
+        List<BmUnit> list = bmUnitPersonService.selectBmUnitList(bmUnitPerson);
         ExcelUtil<BmUnit> util = new ExcelUtil<BmUnit>(BmUnit.class);
         util.exportExcel(response, list, "往来单位管理数据");
     }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java

@@ -45,6 +45,7 @@ public class WarehousingServiceImpl implements WarehousingService {
     @Resource
     private TypeMapper typeMapper;
 
+
 //    @Autowired
 //    private PurchaseInputMapper purchaseInputMapper;
 
@@ -61,6 +62,8 @@ public class WarehousingServiceImpl implements WarehousingService {
     @Override
     public List<SupplierInfo> selectMaSupplierInfoList(SupplierInfo maSupplierInfo)
     {
+        Long companyId=typeService.getUserDeptId();
+        maSupplierInfo.setCompanyId(companyId+"");
         return warehousingMapper.selectMaSupplierInfoList(maSupplierInfo);
     }
 

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml

@@ -37,6 +37,11 @@
             supplier_id as supplierId ,
             supplier as supplier
         FROM ma_supplier_info
+        <where>
+            <if test="companyId !=null and companyId !=''">
+                and company_id = #{companyId}
+            </if>
+        </where>
     </select>
 
     <select id="selectByMaCode" resultType="java.lang.Integer">