黄潞潞
2024-06-07 482f807361c9bc0dce2db949a29c755cf858548b
esign_weaver/src/weaver/WeaverHandler.java
@@ -24,6 +24,7 @@
import foundation.icall.callout.RemoteSourceBucket;
import foundation.io.FileCenter;
import foundation.io.object.FileRecord;
import foundation.org.Employee;
import foundation.user.OnlineUser;
import foundation.util.MD5Utils;
import foundation.util.Util;
@@ -337,7 +338,6 @@
      String accessKey = eSignSourceMeta.getString(ISignLetter.AppToken);
      String accessSecret = eSignSourceMeta.getString(ISignLetter.AppSecret);
      
      String signerCode = dataReader.getString(ISignLetter.Signer);
      SignBucket signBucket = SignBucket.getInstance();
      SignConfig signConfig = signBucket.get(dataName);
@@ -442,13 +442,13 @@
      
      if (SignType.Both == signConfig.getSignType()) {
         signService = new BothSignService();
         signService = new BothSignService(signConfig);
      }
      else if (SignType.PartyB == signConfig.getSignType()) {
         signService = new PartyBSignService();
         signService = new PartyBSignService(signConfig);
      }
      else if (SignType.PartyA == signConfig.getSignType()) {
         signService = new PartyASignService();
         signService = new PartyASignService(signConfig);
      }
      List<Signer> signers = signService.getSigners(dataNameEntity);
      
@@ -650,6 +650,7 @@
   private Signer getSigner(String companyId) throws Exception {
      Signer signer = new Signer();
      OnlineUser user = OnlineUser.getInstance();
      Employee employee = user.getEmployee();
      ActorTarget actor = user.getCurrentActor();
      String actorId = user.getActorId();
      String accountId = actor.getTargetId();
@@ -668,13 +669,22 @@
         signer.setContactPhone(account.getString("business_phone"));
      }
      else {
         DataObject dataObject = DataObject.getInstance("md_org");
         Entity org = dataObject.getBrowseEntity(companyId);
         
         signer.setSignatoryNo(org.getString("id")); 
         signer.setTenantName(ISignLetter.DefaultInitiator);
         signer.setReceiverName(org.getString("business_person"));
         signer.setContactPhone(org.getString("business_phone"));
         signer.setReceiverName(user.getName());
         String businessPhone = "";
         if (employee != null) {
            businessPhone = employee.getPhone();
         }
         else {
            businessPhone = org.getString("business_phone");
         }
         signer.setContactPhone(businessPhone);
      }
      
      return signer;