diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index d9841e9cb..29881f5c2 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -47,6 +47,7 @@ import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
+import com.wbi.util.StringUtil;
 import dm.jdbc.util.IdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -702,7 +703,7 @@ public class SIAccountBiz extends Service {
     public void updateBatchAccount(AccountParam param, Long employeeId, String tenantKey, String currentUserName) {
         String billMonth = param.getBillMonth();
 
-        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(billMonth, String.valueOf(param.getPaymentOrganization()));
+        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(billMonth, param.getPaymentOrganization());
         Map<Long, List<InsuranceAccountDetailPO>> map = insuranceAccountDetailPOS.stream().filter(item -> item.getEmployeeId() != null)
                 .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getEmployeeId));
         int socialAccountPerson = 0;
@@ -1297,7 +1298,6 @@ public class SIAccountBiz extends Service {
 
     public void deleteCommonAccount(SaveCommonAccountParam param, Long employeeId, String currentUserName) {
         ValidUtil.doValidator(param);
-        SalaryAssert.notBlank(param.getBillMonth(), SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
         SalaryAssert.notEmpty(param.getIncludes(), SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
         MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).batchDelAccountDetails(param.getIncludes(), param.getBillMonth(),param.getPaymentOrganization());
         //记录日志
@@ -1405,7 +1405,7 @@ public class SIAccountBiz extends Service {
     public PageInfo<InsuranceAccountViewListDTO> overView(InsuranceAccountDetailParam queryParam) {
 
 //        SalaryPageUtil.start(queryParam.getCurrent(),queryParam.getPageSize());
-        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(queryParam.getBillMonth(), queryParam.getPaymentOrganization());
+        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(queryParam.getBillMonth(), StringUtil.isBlank(queryParam.getPaymentOrganization()) ? null : Long.valueOf(queryParam.getPaymentOrganization()));
         InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(insuranceAccountDetailPOS);
 
         //获取扣缴义务人信息
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index 80c374f30..f29d72cbb 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -54,7 +54,7 @@ public interface InsuranceAccountDetailMapper {
      * @param billMonth
      * @return
      */
-    List<InsuranceAccountDetailPO> selectList(@Param("billMonth") String billMonth, @Param("paymentOrganization") String paymentOrganization);
+    List<InsuranceAccountDetailPO> selectList(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
 
     List<InsuranceAccountDetailPO> queryList(@Param("billMonth") String billMonth,@Param("employeeIds") Collection<Long> employeeIds);
 
diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
index 60674d6c3..711feb085 100644
--- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
@@ -282,7 +282,9 @@
         hrsa_bill_detail_temp t
         WHERE t.delete_type = 0
         AND t.bill_month = #{billMonth}
-        AND t.payment_organization = #{paymentOrganization}
+        <if test="paymentOrganization != null">
+            AND t.payment_organization = #{paymentOrganization}
+        </if>
         <if test="employeeIds != null and employeeIds.size()>0">
         AND t.employee_id IN
         <foreach collection="employeeIds" open="(" item="employeeId" separator="," close=")">
diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
index 68537425c..26647b467 100644
--- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
@@ -58,7 +58,7 @@ public class SIExportServiceImpl extends Service  implements SIExportService {
 
     @Override
     public XSSFWorkbook exportOverView(InsuranceExportParam queryParam) {
-        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(queryParam.getBillMonth(), queryParam.getPaymentOrganization());
+        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(queryParam.getBillMonth(), StringUtils.isBlank(queryParam.getPaymentOrganization()) ? null : Long.valueOf(queryParam.getPaymentOrganization()));
         InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(insuranceAccountDetailPOS);
 
         //获取扣缴义务人信息