更新

src/com/kingdee/eas/custom/esign/app/ESignTemplateControllerBean.java

@@ -3,7 +3,6 @@ package com.kingdee.eas.custom.esign.app;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kingdee.bos.dao.IObjectValue;
-import com.kingdee.bos.dao.ormapping.CanNotDeleteException;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.metadata.entity.FilterInfo;
 import com.kingdee.bos.metadata.entity.FilterItemCollection;
@@ -25,7 +24,6 @@ import com.kingdee.bos.*;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.eas.common.EASBizException;
 
-import java.sql.Connection;
 import java.sql.Time;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -70,33 +68,27 @@ public class ESignTemplateControllerBean extends AbstractESignTemplateController
         return super._save(ctx, model);
     }
 
+
     /**
-     * 检查电子签名模板是否可以删除
+     * 删除电子签名模板数据
      *
-     * @param ctx 业务上下文对象
-     * @param pk  电子签名模板主键
-     * @param cn  数据库连接对象
-     * @throws CanNotDeleteException 当数据处于启用状态时抛出此异常，表示不允许删除
+     * @param ctx 系统上下文对象
+     * @param pk  要删除数据的主键
+     * @throws BOSException    业务操作异常
+     * @throws EASBizException EAS业务异常
      */
     @Override
-    protected void _canDelete(Context ctx, IObjectPK pk, Connection cn) throws CanNotDeleteException {
-        super._canDelete(ctx, pk, cn);
-        try {
-            // 获取电子签名模板信息并检查状态
-            ESignTemplateInfo info = getESignTemplateInfo(ctx, pk);
-            BaseItemStateEnum state = info.getState();
-            if (BaseItemStateEnum.ENABLE.equals(state)) {
-                throw new CanNotDeleteException("启用的数据，不允许删除！");
-            }
-        } catch (BOSException e) {
-            logger.error(e.getMessage(), e);
-            throw new CanNotDeleteException(e);
-        } catch (EASBizException e) {
-            logger.error(e.getMessage(), e);
-            throw new CanNotDeleteException(e);
+    protected void _delete(Context ctx, IObjectPK pk) throws BOSException, EASBizException {
+        // 获取电子签名模板信息并检查状态
+        ESignTemplateInfo info = getESignTemplateInfo(ctx, pk);
+        BaseItemStateEnum state = info.getState();
+        if (BaseItemStateEnum.ENABLE.equals(state)) {
+            throw new BOSException("启用的数据，不允许删除！");
         }
+        super._delete(ctx, pk);
     }
 
+
     /**
      * 同步模板字段
      *
@@ -132,7 +124,7 @@ public class ESignTemplateControllerBean extends AbstractESignTemplateController
                     //1.调用接口获取模板字段
                     EsignHttpResponse response = null;
                     try {
-                        response = EsignHttpUtil.getDocTemplatesDetailById(eSignTemplateId);
+                        response = EsignHttpUtil.getDocTemplatesDetailById(ctx, eSignTemplateId);
                     } catch (EsignException e) {
                         e.printStackTrace();
                         throw new BOSException("调用e签宝接口报错: " + e.getMessage());

src/com/kingdee/eas/custom/esign/app/ESignTemplateFileEntryControllerBean.java

@@ -116,7 +116,7 @@ public class ESignTemplateFileEntryControllerBean extends AbstractESignTemplateF
         //1.调用接口获取模板字段
         EsignHttpResponse response = null;
         try {
-            response = EsignHttpUtil.getDocTemplatesDetailById(eSignTemplateId);
+            response = EsignHttpUtil.getDocTemplatesDetailById(ctx, eSignTemplateId);
         } catch (EsignException e) {
             e.printStackTrace();
             throw new BOSException("调用e签宝接口报错: " + e.getMessage());
@@ -179,32 +179,23 @@ public class ESignTemplateFileEntryControllerBean extends AbstractESignTemplateF
 
     }
 
-
     /**
-     * 检查电子签名模板文件是否可以删除
+     * 删除电子签名模板数据
      *
-     * @param ctx 上下文对象
-     * @param pk  对象主键
-     * @param cn  数据库连接
-     * @throws CanNotDeleteException 当数据处于启用状态或发生业务异常时抛出
+     * @param ctx 系统上下文对象
+     * @param pk  要删除数据的主键
+     * @throws BOSException    业务操作异常
+     * @throws EASBizException EAS业务异常
      */
     @Override
-    protected void _canDelete(Context ctx, IObjectPK pk, Connection cn) throws CanNotDeleteException {
-        super._canDelete(ctx, pk, cn);
-        try {
-            // 获取电子签名模板文件信息并检查状态
-            ESignTemplateFileEntryInfo info = getESignTemplateFileEntryInfo(ctx, pk);
-            BaseItemStateEnum state = info.getState();
-            if (BaseItemStateEnum.ENABLE.equals(state)) {
-                throw new CanNotDeleteException("启用的数据，不允许删除！");
-            }
-        } catch (BOSException e) {
-            logger.error(e.getMessage(), e);
-            throw new CanNotDeleteException(e);
-        } catch (EASBizException e) {
-            logger.error(e.getMessage(), e);
-            throw new CanNotDeleteException(e);
+    protected void _delete(Context ctx, IObjectPK pk) throws BOSException, EASBizException {
+        // 获取电子签名模板文件信息并检查状态
+        ESignTemplateFileEntryInfo info = getESignTemplateFileEntryInfo(ctx, pk);
+        BaseItemStateEnum state = info.getState();
+        if (BaseItemStateEnum.ENABLE.equals(state)) {
+            throw new CanNotDeleteException("启用的数据，不允许删除！");
         }
+        super._delete(ctx, pk);
     }
 
 }