diff --git a/src/main/java/com/seeyon/apps/esign/node/EsignAntiFakeSignNode.java b/src/main/java/com/seeyon/apps/esign/node/EsignAntiFakeSignNode.java index 77f2312..04ea5fe 100644 --- a/src/main/java/com/seeyon/apps/esign/node/EsignAntiFakeSignNode.java +++ b/src/main/java/com/seeyon/apps/esign/node/EsignAntiFakeSignNode.java @@ -23,6 +23,7 @@ import com.seeyon.ctp.organization.bo.V3xOrgMember; import com.seeyon.ctp.organization.manager.OrgManager; import com.seeyon.ctp.util.JDBCAgent; import com.seeyon.utils.form.*; +import groovy.sql.Sql; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -116,7 +117,7 @@ public class EsignAntiFakeSignNode extends ACommonSuperNode { param.setPageSize(1); param.setOrderField("UPDATE_DATE"); param.setSortType("DESC"); - Map sqlMap = FormTableExecutor.generateSql(param); + Map sqlMap = SqlGenerator.generateSql(param); JDBCAgent agent = new JDBCAgent(); try { agent.execute((String)sqlMap.get("sql"), (List)sqlMap.get("params")); diff --git a/src/main/java/com/seeyon/apps/esign/node/EsignMultipleSignerNode.java b/src/main/java/com/seeyon/apps/esign/node/EsignMultipleSignerNode.java index fa9d37b..d7031ae 100644 --- a/src/main/java/com/seeyon/apps/esign/node/EsignMultipleSignerNode.java +++ b/src/main/java/com/seeyon/apps/esign/node/EsignMultipleSignerNode.java @@ -169,7 +169,7 @@ public class EsignMultipleSignerNode extends ACommonSuperNode { }else { OrgInfo bOrgInfo = new OrgInfo(); bOrgInfo.setLegalName(getStringField(formDataVo,"乙方法人姓名")); - bOrgInfo.setOrgName(getStringField(formDataVo,"乙方单位名称")); + bOrgInfo.setOrgName(getStringField(formDataVo,"乙方名称")); bOrgInfo.setOrgCode(getStringField(formDataVo,"乙方统一社会信用代码")); bOrgInfo.setLegalIdCardNo(getStringField(formDataVo,"乙方法人身份证号")); PersonInfo transactor = new PersonInfo(); @@ -203,7 +203,7 @@ public class EsignMultipleSignerNode extends ACommonSuperNode { param.setPageSize(1); param.setOrderField("UPDATE_DATE"); param.setSortType("DESC"); - Map sqlMap = FormTableExecutor.generateSql(param); + Map sqlMap = SqlGenerator.generateSql(param); JDBCAgent agent = new JDBCAgent(); try { agent.execute((String)sqlMap.get("sql"), (List)sqlMap.get("params")); diff --git a/src/main/java/com/seeyon/apps/esign/node/EsignOneSignerNode.java b/src/main/java/com/seeyon/apps/esign/node/EsignOneSignerNode.java index 9fd9ff5..addc55d 100644 --- a/src/main/java/com/seeyon/apps/esign/node/EsignOneSignerNode.java +++ b/src/main/java/com/seeyon/apps/esign/node/EsignOneSignerNode.java @@ -174,7 +174,7 @@ public class EsignOneSignerNode extends ACommonSuperNode { }else { OrgInfo bOrgInfo = new OrgInfo(); bOrgInfo.setLegalName(getStringField(formDataVo,"乙方法人姓名")); - bOrgInfo.setOrgName(getStringField(formDataVo,"乙方单位名称")); + bOrgInfo.setOrgName(getStringField(formDataVo,"乙方名称")); bOrgInfo.setOrgCode(getStringField(formDataVo,"乙方统一社会信用代码")); bOrgInfo.setLegalIdCardNo(getStringField(formDataVo,"乙方法人身份证号")); PersonInfo transactor = new PersonInfo(); diff --git a/src/main/java/com/seeyon/apps/esign/po/signer/DefaultSignerBuilder.java b/src/main/java/com/seeyon/apps/esign/po/signer/DefaultSignerBuilder.java index e4b68b5..e37433d 100644 --- a/src/main/java/com/seeyon/apps/esign/po/signer/DefaultSignerBuilder.java +++ b/src/main/java/com/seeyon/apps/esign/po/signer/DefaultSignerBuilder.java @@ -336,18 +336,18 @@ public class DefaultSignerBuilder implements SignerBuilder { EsignBaseResp resp = JsonUtils.parseObject(respStr, EsignBaseResp.class); if (!"0".equals(String.valueOf(resp.getCode()))) { - return 10; + return 0; } Map data = (Map) resp.getData(); Object pageCount = data.get("fileTotalPageCount"); if (pageCount == null) { - return 10; + return 0; } int pages = Integer.parseInt(String.valueOf(pageCount)); - return pages > 0 ? pages : 10; + return pages > 0 ? pages : 0; } catch (Exception e) { - return 10; + return 0; } }