diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index 04f0a1fb..2265be7d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -27,10 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +45,7 @@ import java.util.*;
  */
 @SuppressWarnings({"AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"})
 @RestController
+@RequestMapping("/sn")
 @Slf4j
 public class SDNYMainProcessController extends AbstractController {
 
@@ -90,23 +88,22 @@ public class SDNYMainProcessController extends AbstractController {
     @Resource
     private MixedSignatureDao mixedSignatureDao;
 
+    @Resource
+    private SysDeptDao sysDeptDao;
+
     /**
      * 查验发票
      */
-    @PostMapping("/sn/singleInvoiceCheck")
+    @PostMapping("/singleInvoiceCheck")
     @ResponseBody
     @SysLog("发票查验")
     public ResponseEntity<String> singleInvoiceCheck(@RequestBody Map<String, String> pramsMap) throws ParseException {
         log.info("传入的参数为:{}", pramsMap);
         String userid = "101833";
         String dbName = "business";
-        String company = "BIGB";
-        // 入参统一在入口处理
-//        String userid = getLoginName();
-//        String dbName = getUserInfo().getDbName();
-//        String company = getUserInfo().getCompany();
         JSONObject checkInvoiceResult = null;
 
+        //挡板开关
         if("1".equals(isPresure)){
             String base64 = "ewoJImNvZGUiOiAxMDAwLAoJImRhdGEiOiB7CgkJImRyYXdlZU5hbWUiOiAiIiwKCQkiYnVzaW5lc3NVbml0IjogIiIsCgkJImxlbW9uTWFya2V0VGF4Tm8iOiAiOTEzNzAxMjVNQTNRQUtDMjhBIiwKCQkiYnJhbmRNb2RlbCI6ICLliKvlhYvniYxTR002NTIxVUJBMSIsCgkJInZlaGljbGVJZGVudGlmaWNhdGlvbk5vIjogIkxTR1VBODJMN01HMDgzODcwIiwKCQkiaWRjYXJkTm8iOiAiIiwKCQkic291cmNlIjogIiIsCgkJInRyYW5zcG9ydFJvdXRlIjogIiIsCgkJInRvdGFsVGF4IjogIiIsCgkJImJ1c2luZXNzVW5pdEFkZHJlc3MiOiAiIiwKCQkibGljZW5zZVBsYXRlIjogIuS6kUFFODVTNSIsCgkJInNlbGxlclVuaXRPckluZGl2aWR1YWwiOiAi5rWO5Y2X5YyX5p6B5pif5rG96L2m5pyN5Yqh5pyJ6ZmQ5YWs5Y+45LqR5Y2X5YiG5YWs5Y+4IiwKCQkiYWRtaW5pc3RyYXRpdmVEaXZpc2lvbk5vIjogIiIsCgkJImNhcnJpZXJOYW1lIjogIiIsCgkJInRheFJlY29yZHMiOiAiIiwKCQkic2FsZXNCYW5rIjogIiIsCgkJImxlbW9uTWFya2V0IjogIuWxseS4nOa2pumAmuS6jOaJi+i9puW4guWcuuacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VUeXBlIjogIjE1IiwKCQkibGltaXRQZW9wbGUiOiAiIiwKCQkibWFjaGluZU5vIjogIjU4OTkxNjQyNDc3MiIsCgkJInB1cmNoYXNlckFkZHJlc3NQaG9uZSI6ICIiLAoJCSJzdGF0ZSI6ICIwIiwKCQkiaW52b2ljZU5vIjogIjAwMzI3OTYyIiwKCQkidmVoaWNsZVR5cGUiOiAi5bCP5Z6L5pmu6YCa5a6i6L2mIiwKCQkiZW5naW5lTm8iOiAiIiwKCQkiaW5zcGVjdGlvbk51bSI6ICIiLAoJCSJtYWNoaW5lQ29kZSI6ICIiLAoJCSJidXNpbmVzc1VuaXRQaG9uZSI6ICIiLAoJCSJzZWxsZXJQaG9uZSI6ICIxNTkxMDA4NDM4NCIsCgkJInplcm9UYXhSYXRlU2lnbiI6ICIiLAoJCSJpbnZvaWNlQ29kZSI6ICIwMzcwMDIxMDA0MTciLAoJCSJjZXJ0aWZpY2F0ZU5vIjogIiIsCgkJInB1cmNoYXNlck5hbWUiOiAiIiwKCQkiY2hlY2tDb2RlIjogIiIsCgkJImJpbGxpbmdEYXRlIjogIjIwMjMtMDMtMTciLAoJCSJ0b3RhbEFtb3VudCI6ICIiLAoJCSJ2ZWhpY2xlTm8iOiAiTFNHVUE4Mkw3TUcwODM4NzAiLAoJCSJzYWxlc0FkZHJlc3NQaG9uZSI6ICIiLAoJCSJidXllclBob25lIjogIjE1Njg4ODg1MjA1IiwKCQkic2FsZXNOYW1lIjogIiIsCgkJInB1cmNoYXNlclRheE5vIjogIiIsCgkJInNlbGxlclVuaXRDb2RlT3JJZE5vIjogIjkxNTMwMTAyTUE3SzcyWVQ1QyIsCgkJImNhcnJpZXJUYXhObyI6ICIiLAoJCSJ0YXhBdXRob3JpdHlOYW1lIjogIiIsCgkJImluc3BlY3Rpb25MaXN0Tm8iOiAiIiwKCQkiYW1vdW50VGF4IjogIiIsCgkJIm9yaWdpblBsYWNlIjogIiIsCgkJImNlcnRpZmljYXRlIjogIiIsCgkJImJ1eWVySUROdW0iOiAiIiwKCQkicGF5bWVudFZvdWNoZXJObyI6ICIiLAoJCSJsZW1vbk1hcmtldEFkZHJlc3MiOiAi5bGx5Lic55yB5rWO5Y2X5biC5rWO5YyX5byA5Y+R5Yy65Lit5bCP5LyB5Lia5a215YyW5ZutIiwKCQkiZmFjdG9yeU1vZGVsIjogIuWIq+WFi+eJjFNHTTY1MjFVQkExIiwKCQkiYnV5ZXJVbml0T3JJbmRpdmlkdWFsIjogIua1juWNl+WMl+aegeaYn+axvei9puacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VOdW1iZXIiOiAiMDAzMjc5NjIiLAoJCSJ0b2xsU2lnbiI6ICIwNyIsCgkJInRheEJ1cmVhdUNvZGUiOiAiIiwKCQkidG9ubmFnZSI6ICIiLAoJCSJ0YXhBdXRob3JpdHlObyI6ICIiLAoJCSJjb21wYW55IjogIkJJR0IiLAoJCSJsZW1vbk1hcmtldFBob25lIjogIjEzODU0MTkzMDI1IiwKCQkicHVyY2hhc2VyQmFuayI6ICIiLAoJCSJhZG1pbmlzdHJhdGl2ZURpdmlzaW9uTmFtZSI6ICIiLAoJCSJwYXNzZW5nZXJzTGltaXRlZCI6ICIiLAoJCSJidXllclVuaXRPckluZGl2aWR1YWxBZGRyZXNzIjogIuWxseS4nOecgea1juWNl+W4guWkqeahpeWMuuWMl+WFs+WMl+i3rzblj7fmuZblhYnlsbHoibLlrrblm600LTMtMTAyIiwKCQkiaW52b2ljZUxpbmVMaXN0IjogW3sKCQkJInVuaXRQcmljZSI6ICIiLAoJCQkicm93Tm8iOiAiMSIsCgkJCSJhbW91bnQiOiAiIiwKCQkJInNwZWNpZmljYXRpb25Nb2RlbCI6ICIiLAoJCQkicXVhbnRpdHkiOiAiIiwKCQkJInRheCI6ICIiLAoJCQkidHlwZSI6ICIiLAoJCQkidW5pdCI6ICIiLAoJCQkibGljZW5zZVBsYXRlTnVtIjogIiIsCgkJCSJjdXJyZW50RGF0ZUVuZCI6ICIiLAoJCQkiY29tbW9kaXR5Q29kZSI6ICIiLAoJCQkiY3VycmVudERhdGVTdGFydCI6ICIiLAoJCQkiY29tbW9kaXR5TmFtZSI6ICIiCgkJfV0sCgkJImxlbW9uTWFya2V0QmFua0FuZEFjY291bnQiOiAi5Lit5Zu96ZO26KGM5rWO6Ziz5pSv6KGM6JCl5Lia6YOoMjMyNTQwNzQ2NjQ5IiwKCQkic2FsZXNUYXhObyI6ICIiLAoJCSJzZWxsZXJVbml0T3JJbmRpdmlkdWFsQWRkcmVzcyI6ICLkupHljZfnnIHmmIbmmI7luILkupTljY7ljLrpu5Hmnpfpk7rooZfpgZPlip7kuovlpITkurrmsJHopb/ot683MjDlj7dN5qCLTS0xMOWPtyIsCgkJImJ1c2luZXNzVW5pdEJhbmtBbmRBY2NvdW50IjogIiIsCgkJInZlaGljbGVBZG1pbk9mZmljZSI6ICLmtY7ljZfluIIiLAoJCSJhbW91bnRUYXhDTiI6ICIiLAoJCSJyZWdpc3RyYXRpb25ObyI6ICIzNzAwMzc1ODUzNTciLAoJCSJwcm9kdWN0UGxhY2UiOiAiIiwKCQkicmVtYXJrcyI6ICIiLAoJCSJ0YXhCdXJlYXVOYW1lIjogIiIKCX0sCgkibWVzc2FnZSI6ICJzdWNjZXNzIgp9";
             String result = Base64Encoding.decodeToString(base64);
@@ -216,7 +213,6 @@ public class SDNYMainProcessController extends AbstractController {
                 if (!checkInvoiceResult.containsKey("cyjg")) {
 
                     checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber"));
-                    checkInvoiceResult.put("company", company);
                     log.info("返回给影像系统的结果为:{}", checkInvoiceResult);
                     signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName);
                 }
@@ -234,7 +230,6 @@ public class SDNYMainProcessController extends AbstractController {
 
             if (insert > 0) {
                 checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber"));
-                checkInvoiceResult.put("company", company);
                 checkInvoiceResult.put("message", "入库成功");
                 log.info("返回给影像系统的结果为:{}", checkInvoiceResult);
             }
@@ -391,30 +386,20 @@ public class SDNYMainProcessController extends AbstractController {
     /**
      * 查验发票
      */
-    @PostMapping("/sn/syncInvoiceInfo")
+    @PostMapping("/syncInvoiceInfo")
     @ResponseBody
     @SysLog("同步发票信息")
     public ResponseEntity<String> syncInvoiceInfo(@RequestBody SNRequestObject snRequestObject) {
 
         log.info("影像系统同步数据:{}", JSONObject.toJSONString(snRequestObject));
 
-        String userid = "101833";
         String dbName = "business";
-        String company = "BIGB";
-        String taxNo = "9111112222333344DD";
-        String orgCode = "1010";
-
-//        // 入参统一在入口处理
-//        String userid = getLoginName();
-//        String dbName = getUserInfo().getDbName();
-//        String company = getUserInfo().getCompany();
-//        List<TaxOrgCode> orgCodes = getUserInfo().getOrgCodes();
-//        String orgCode = orgCodes.get(0).getOrgCode();
-//        List<String> gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-//        String gfsh = "";
-//        if (gfshAll.size() > 0) {
-//            gfsh = gfshAll.get(0);
-//        }
+        // 入参统一在入口处理
+        String orgCode = snRequestObject.getCompCode();
+        SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(orgCode);
+        log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
+        String company = orgByCompCode.getCompany();
+        String taxno = orgByCompCode.getTaxno();
 
         String result = "";
 
@@ -439,20 +424,21 @@ public class SDNYMainProcessController extends AbstractController {
             object.setZFILED2("");
             object.setZFILED3("");
             object.setZFILED4("");
-//            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
-//            if(gsClients != null && gsClients.size() > 0) {
-//                object.setZFILED5(gsClients.get(0).getClient());
-//            }else{
-//                object.setZFILED5(environment);
-//            }
 
-            object.setZFILED5(environment);
+            DynamicContextHolder.push(DbConstant.BASICS_READ);
+            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
+            if(gsClients != null && gsClients.size() > 0) {
+                object.setZFILED5(gsClients.get(0).getClient());
+            }else{
+                object.setZFILED5(environment);
+            }
+//            object.setZFILED5(environment);
             List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
             if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
                 for (SNInvoice invoice : invoiceInfoList) {
                     String fplxdm = "";
                     String snFplx = "";
-                    result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm, imageId, compCode);
+                    result = snPushCheckRecordService.updateInvoicePoll(company, taxno, reimburse, invoice, fplxdm, imageId, compCode);
 
                     //价税分离判断
                     if (!"ok".equals(result) && !"0000".equals(result)) {