diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
index a0b4f794..db8d1873 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
@@ -117,4 +117,6 @@ public class BaseReceiptInvoiceView implements Serializable {
private String certDate;
private String outBelongDate;
+ //转出来源 1 sap
+ private String outResource;
}
diff --git a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
index 4d937745..cc7ffb04 100644
--- a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
@@ -26,6 +26,7 @@
+
@@ -90,7 +91,7 @@
SELECT
, b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount
- , b.rzh_date,b.invoice_type
+ , b.rzh_date,b.invoice_type,b.out_resource
FROM t_dx_record_invoice_out a
LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid
diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
index d5027fe9..866fe548 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
@@ -261,6 +261,7 @@ public class EmailMaintainController extends AbstractController {
if(StringUtils.isEmpty(userCode)){
return ResponseEntity.ok(R.error("数据不能为空!"));
}
+ DynamicContextHolder.push(DbConstant.BASICS_READ);
String userName = emailMaintainService.getUserName(userCode);
if(StringUtils.isNotEmpty(userName)){
JSONObject json = new JSONObject();
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
index c5839165..cfca00b3 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
+import com.dxhy.common.utils.Base64Encoding;
import com.dxhy.core.dao.mailGather.EmailMaintainDao;
import com.dxhy.core.model.mailGather.EmailMaintainVo;
import com.dxhy.core.service.mailGather.EmailMaintainService;
@@ -54,6 +55,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
for (int i = 0; i < emailMaintainVos.size(); i++) {
EmailMaintainVo emailMaintainVo = emailMaintainVos.get(i);
emailMaintainVo.setXh(i + 1 + "");
+ emailMaintainVo.setEmailPassword(Base64Encoding.decodeToString(emailMaintainVo.getEmailPassword()));
}
}
PageInfo pageInfo = new PageInfo<>(emailMaintainVos);
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
index 4ff4d863..82861c3f 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
@@ -475,5 +475,6 @@ public class BaseTDxRecordInvoice implements Serializable {
* g公司id
*/
private String compCode;
+ private String outResource;
}
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
index fbcaf001..d741974a 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
@@ -120,6 +120,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl