Merge branch 'dev' into dev-konghuo

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java

@@ -1224,7 +1224,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
     public List<CustomerDO> getDeptCustomerExcelVoListReq(CustomerExportReqDTO exportReqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         Long deptId =null;
-        if (null != loginUser && null != loginUser.getDeptId()) {
+        if (null != loginUser && loginUser.getDeptId()>0) {
             deptId =  loginUser.getDeptId() ;
         }
         return customerMapper.getDeptCustomerExcelVoListReq(exportReqVO,deptId) ;

yudao-module-product/yudao-module-product-rest/src/main/java/cn/iocoder/yudao/module/product/controller/admin/product/ProductController.java

@@ -176,7 +176,7 @@ public class ProductController {
     @ApiOperation("导出商品 Excel")
     @PreAuthorize("@ss.hasPermission('ecw:product:export')")
     @OperateLog(type = EXPORT)
-    public CommonResult<Boolean> exportProductExcel(@Valid ProductExportReqVO exportReqVO,
+    public CommonResult<Boolean> exportProductExcel(@Valid ProductReqDTO exportReqVO,
               HttpServletResponse response) throws IOException {
 
         FileMakeReqDTO reqDTO = new FileMakeReqDTO();