diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 500b14d4e..bead03472 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -15,8 +15,6 @@ import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
 import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO;
 import com.engine.salary.entity.siaccount.param.*;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO;
-import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO;
-import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailTempPO;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesAccountPO;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO;
@@ -24,14 +22,12 @@ import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO;
 import com.engine.salary.entity.sicategory.po.ICategoryPO;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO;
 import com.engine.salary.entity.taxrate.TaxAgent;
 import com.engine.salary.enums.siaccount.*;
 import com.engine.salary.enums.sicategory.*;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.TaxAgentMapper;
 import com.engine.salary.mapper.datacollection.EmployMapper;
-import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper;
 import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper;
 import com.engine.salary.mapper.siaccount.InsuranceAccountInspectMapper;
 import com.engine.salary.mapper.siaccount.SIAccountDetailTempMapper;
@@ -87,8 +83,6 @@ public class SIAccountBiz extends Service {
             SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             List<InsuranceAccountBatchPO> list  = insuranceAccountBatchMapper.list(queryParam);
             list = SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
-            PageInfo<InsuranceAccountBatchPO> pageInfo = new PageInfo<>(list,InsuranceAccountBatchPO.class);
-            List<InsuranceAccountBatchPO> list = insuranceAccountBatchMapper.list(queryParam);
             PageInfo<InsuranceAccountBatchPO> pageInfo = new PageInfo<>(list, InsuranceAccountBatchPO.class);
             return pageInfo;
         } finally {
@@ -106,7 +100,6 @@ public class SIAccountBiz extends Service {
             List<InsuranceAccountDetailPO> list = insuranceAccountDetailMapper.list(queryParam);
             InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(list);
             PageInfo<InsuranceAccountDetailPO> pageInfo = new PageInfo<>(list,InsuranceAccountDetailPO.class);
-            PageInfo<InsuranceAccountDetailPO> pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class);
             return pageInfo;
         } finally {
             sqlSession.close();
@@ -115,11 +108,10 @@ public class SIAccountBiz extends Service {
 
     public void save(boolean flag, AccountParam param, Long employeeId, String currentUserName) {
         if (flag) {
-            InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth());
+            InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
             insuranceAccountBatchPO = SiAccountEncrypt.decryptInsuranceAccountBatch(insuranceAccountBatchPO);
             SalaryAssert.isNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel( 100461, "所属月份存在核算数据"));
-            InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
-            SalaryAssert.isNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(100461, "所属月份存在核算数据"));
+
 
             InsuranceAccountBatchPO build = InsuranceAccountBatchPO.builder()
                     //.id(IdGenerator.generate())
@@ -153,9 +145,8 @@ public class SIAccountBiz extends Service {
     public void account(AccountParam param, Long employeeId, String tenantKey, String currentUserName) {
         List<Long> employeeIds = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectAccountIds(SalaryDateUtil.getMonthBegin(param.getBillMonth()), param.getPaymentOrganization());
         if (CollectionUtils.isEmpty(employeeIds)) {
-            List<InsuranceAccountBatchPO> list = Lists.newArrayList(MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(billMonth));
-            SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
             List<InsuranceAccountBatchPO> list = Lists.newArrayList(MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth(), param.getPaymentOrganization()));
+            SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
             if (CollectionUtils.isNotEmpty(list)) {
                 list.stream().forEach(f -> {
                     MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).deleteById(f.getId());
@@ -225,9 +216,8 @@ public class SIAccountBiz extends Service {
             MapperProxyFactory.getProxy(SIAccountDetailTempMapper.class).batchDelAccountTempDetails(ids, param.getBillMonth());
         } catch (Exception e) {
             log.error("account run fail", e);
-            List<InsuranceAccountBatchPO> list = Lists.newArrayList(MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth()));
-            list = SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
             List<InsuranceAccountBatchPO> list = Lists.newArrayList(MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(param.getBillMonth(), param.getPaymentOrganization()));
+            list = SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
             if (CollectionUtils.isNotEmpty(list)) {
                 list.stream().forEach(f -> {
                     MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).deleteById(f.getId());