提交代码

src/com/kingdee/eas/custom/beisen/synchronousorg/SynchronousEmpBillControllerBean.java

@@ -804,11 +804,23 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
 
                 } else if (dataObject instanceof JSONArray) {
                     JSONArray jsonArray1 = jsonObject.getJSONArray(split[0]);
-                    if ((split[0].equals("entryRecord")||split[0].equals("employmentRecord"))&&jsonArray1.size()>0){
-                        jsonArray1 = paixu(jsonArray1, "entryDate");
-                        System.out.println("排序后entryRecord/employmentRecord"+jsonArray1);
-                        // （可选）将排序后的List转回JSONArray
+                    if (jsonArray1.size() > 0) {
+                        if (split[0].equals("entryRecord")) {
+                            // 定义日期格式
+                            jsonArray1 = paixu(jsonArray1, "createdTime");
+                            System.out.println("排序后entryRecord" + jsonArray1);
+                            // （可选）将排序后的List转回JSONArray
+                        } else if (split[0].equals("employmentRecord")) {
+                            jsonArray1 = paixu(jsonArray1, "entryDate");
+                            System.out.println("排序后employmentRecord" + jsonArray1);
+                        }
+
                     }
+//                    if ((split[0].equals("entryRecord")||split[0].equals("employmentRecord"))&&jsonArray1.size()>0){
+//                        jsonArray1 = paixu(jsonArray1, "entryDate");
+//                        System.out.println("排序后entryRecord/employmentRecord"+jsonArray1);
+                    //                        // （可选）将排序后的List转回JSONArray
+                    //                    }
                     for (int j = 0; j < jsonArray1.size(); j++) {
                         JSONObject data = jsonArray1.getJSONObject(j);
                         if (data != null) {
@@ -862,14 +874,21 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                         value = attributes.get("data-defaultValue");
                     } else {
                         JSONArray jsonArray = jsonObject.getJSONArray(split[0]);
-                        if ((split[0].equals("entryRecord")||split[0].equals("employmentRecord"))&&jsonArray.size()>0){
-                            // 定义日期格式
-                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-                            JSONArray sortedJsonArray = paixu(jsonArray, "entryDate");
-                            System.out.println("排序后entryRecord/employmentRecord"+sortedJsonArray);
-                            // （可选）将排序后的List转回JSONArray
-                            data1 = sortedJsonArray.getJSONObject(0);
-                        }else {
+                        if (jsonArray.size() > 0) {
+                            if (split[0].equals("entryRecord")) {
+                                // 定义日期格式
+                                JSONArray sortedJsonArray = paixu(jsonArray, "createdTime");
+                                System.out.println("排序后entryRecord" + sortedJsonArray);
+                                // （可选）将排序后的List转回JSONArray
+                                data1 = sortedJsonArray.getJSONObject(0);
+                            } else if (split[0].equals("employmentRecord")) {
+                                JSONArray sortedJsonArray = paixu(jsonArray, "entryDate");
+                                System.out.println("排序后employmentRecord" + sortedJsonArray);
+                                // （可选）将排序后的List转回JSONArray
+                                data1 = sortedJsonArray.getJSONObject(0);
+                            }
+
+                        } else {
                             data1 = jsonArray.getJSONObject(0);
                         }
 
@@ -1002,25 +1021,25 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                         //coreBaseInfo.put("passportNO", value);
                         setCoreBaseInfo(coreBaseInfo, "entrys.passportNO", value);
                     }
-                    String where = "where IDCardNo = '"+value+"' or passportNO='"+value+"'";
-                    System.out.println("====判断是否再入职=="+where);
+                    String where = "where IDCardNo = '" + value + "' or passportNO='" + value + "'";
+                    System.out.println("====判断是否再入职==" + where);
                     EmpEnrollBizBillEntryCollection empEnrollBizBills = EmpEnrollBizBillEntryFactory
                             .getLocalInstance(context).getEmpEnrollBizBillEntryCollection(where);
                     HRBizDefineInfo hrBizDefineInfo = new HRBizDefineInfo();
-                    System.out.println("====empEnrollBizBills=="+empEnrollBizBills.size());
-                    if (empEnrollBizBills.size()>0){
+                    System.out.println("====empEnrollBizBills==" + empEnrollBizBills.size());
+                    if (empEnrollBizBills.size() > 0) {
                         System.out.println("====empEnrollBizBills= DawAAAApC9TmaL7Z= 是");
                         hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9TmaL7Z"));
                         setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
-                    }else {
+                    } else {
 
                         PersonCollection personCollection = PersonFactory.getLocalInstance(context)
                                 .getPersonCollection("where PassportNO='" + value + "' or IDCardNO='" + value + "'");
-                        if (personCollection.size()>0){
+                        if (personCollection.size() > 0) {
                             System.out.println("====empEnrollBizBills= DawAAAApC9TmaL7Z= 是");
                             hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9TmaL7Z"));
                             setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
-                        }else {
+                        } else {
                             System.out.println("====empEnrollBizBills= DawAAAApC9DmaL7Z= 否");
                             hrBizDefineInfo.setId(BOSUuid.read("DawAAAApC9DmaL7Z"));
                             setCoreBaseInfo(coreBaseInfo, "entrys.hrBizDefine", hrBizDefineInfo);
@@ -1028,31 +1047,31 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
 
                     }
                 } else {
-                    if (name.equals("nCell")){
+                    if (name.equals("nCell")) {
                         String s = extractContent((String) value);
-                        System.out.println(s +"''''''''"+value );
-                        if (s!=null&&!s.equals("")){
+                        System.out.println(s + "''''''''" + value);
+                        if (s != null && !s.equals("")) {
                             System.out.println("setCoreBaseInfo(coreBaseInfo, \"globalRoaming\", s);\n");
                             setCoreBaseInfo(coreBaseInfo, "globalRoaming", s);
-                            value = ((String) value).replace("("+s+")","");
-                            setCoreBaseInfo(coreBaseInfo, name, value);
-                        }else {
+                            value = ((String) value).replace("(" + s + ")", "");
+                        } else {
                             System.out.println("setCoreBaseInfo(coreBaseInfo, \"globalRoaming\", +86);\n");
                             setCoreBaseInfo(coreBaseInfo, "globalRoaming", "+86");
                         }
-                    }else if (name.equals("entrys.nCell")||name.equals("entrys.telNum")){
+                        setCoreBaseInfo(coreBaseInfo, name, value);
+                    } else if (name.equals("entrys.nCell") || name.equals("entrys.telNum")) {
                         String s = extractContent((String) value);
-                        System.out.println(s +"''''''''"+value );
-                        if (s!=null&&!s.equals("")) {
+                        System.out.println(s + "''''''''" + value);
+                        if (s != null && !s.equals("")) {
                             System.out.println("setCoreBaseInfo(coreBaseInfo, \"entrys.globalRoaming\", s));\n");
                             setCoreBaseInfo(coreBaseInfo, "entrys.globalRoaming", s);
-                            value = ((String) value).replace("("+s+")","");
-                            setCoreBaseInfo(coreBaseInfo, name, value);
-                        }else {
+                            value = ((String) value).replace("(" + s + ")", "");
+                        } else {
                             System.out.println("setCoreBaseInfo(coreBaseInfo, \"entrys.globalRoaming\", +86));\n");
                             setCoreBaseInfo(coreBaseInfo, "entrys.globalRoaming", "+86");
                         }
-                    }else {
+                        setCoreBaseInfo(coreBaseInfo, name, value);
+                    } else {
                         setCoreBaseInfo(coreBaseInfo, name, value);
                     }
                     // 将值设置到当前实体对象中
@@ -1438,28 +1457,35 @@ public class SynchronousEmpBillControllerBean extends AbstractSynchronousEmpBill
                     // 从网络下载文件数据
                     byte[] dataImg = null;
                     if (url.indexOf("http:") >= 0 || url.indexOf("https:") >= 0) {
+                        if ( url.indexOf("https:") >= 0){
+                            url = url.replace("https:","http:");
+                        }
+                        System.out.println("=============="+url);
                         dataImg = helper.getBytesByNetURL(url);
                     } else {
                         dataImg = helper.getBytesByNetURL("http:" + url);
                     }
                     // 插入人员附件信息
-                    if (name != null&&!name.equals("")) {
+                    if (name != null && !name.equals("")) {
                         String s = extractFileNameFromUrl(url);
                         String[] split = s.split("\\.");
-                        System.out.println("+++++split+++++++++"+split[1]);
-                        name = name + "." +split[1];
-                    }else {
+                        System.out.println("+++++split+++++++++" + split[1]);
+                        name = name + "." + split[1];
+                    } else {
                         name = extractFileNameFromUrl(url);
                     }
                     insertPersonAttachment(name, uipk, id, dataImg);
                 } catch (IOException e) {
                     // 抛出运行时异常，表示下载文件数据失败
-                    throw new RuntimeException(e+"抛出运行时异常，表示下载文件数据失败");
+                    e.printStackTrace();
+                    throw new RuntimeException(e + "抛出运行时异常，表示下载文件数据失败");
                 } catch (BOSException e) {
                     // 抛出运行时异常，表示插入人员附件信息失败
-                    throw new RuntimeException(e+"抛出运行时异常，表示插入人员附件信息失败");
+                    e.printStackTrace();
+                    throw new RuntimeException(e + "抛出运行时异常，表示插入人员附件信息失败");
                 } catch (EASBizException e) {
                     // 抛出运行时异常，表示插入人员附件信息失败
+                    e.printStackTrace();
                     throw new RuntimeException(e);
                 }
             }

src/com/kingdee/eas/custom/beisen/synchronousorg/synchronousOrgControllerBean.java

@@ -142,11 +142,12 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
         AdminOrgUnitInfo parent = adminOrgUnitInfo.getParent();
         if (parent != null) {
             // 上级组织信息不为空时，添加上级组织原始 ID
-            requestBody.put("parentOriginalId", parent.getId().toString());
+            String number = parent.getNumber();
+            requestBody.put("parentOriginalId", number);
         }
 
         // 添加组织原始 ID
-        requestBody.put("originalId", adminOrgUnitInfo.getId().toString());
+        requestBody.put("originalId", adminOrgUnitInfo.getNumber());
 
         // 创建一个 JSON 数组，用于存储部门负责人 ID
         JSONArray originalIds = new JSONArray();
@@ -176,8 +177,8 @@ public class synchronousOrgControllerBean extends AbstractsynchronousOrgControll
             }
             JSONObject customFieldList = new JSONObject();
             //部门负责人岗位编码 注释的是测试的  后面是生产的（extbumenfuzerengangweibianma_611852_1958016168，extbumenfuzerengangweimingcheng_611852_315949968）
-            //customFieldList.put("extbumenfuzerengangweibianma_433107_1704083012", responPosition.getNumber());
-            //customFieldList.put("extbumenfuzerengangweimingcheng_433107_501692677", responPosition.getName());
+//            customFieldList.put("extbumenfuzerengangweibianma_433107_1704083012", responPosition.getNumber());
+//            customFieldList.put("extbumenfuzerengangweimingcheng_433107_501692677", responPosition.getName());
             customFieldList.put("extbumenfuzerengangweibianma_611852_1958016168", responPosition.getNumber());
             customFieldList.put("extbumenfuzerengangweimingcheng_611852_315949968", responPosition.getName());
             requestBody.put("customFieldList", customFieldList);

src/com/kingdee/eas/custom/beisen/utils/BeiSenUtils.java

@@ -115,8 +115,8 @@ public class BeiSenUtils {
     }
     public JSONObject createOrUpdateByOrg(JSONObject requestBody, AdminOrgUnitInfo adminOrgUnitInfo) throws FileNotFoundException, IOException
             , URISyntaxException {
-        String originalId = adminOrgUnitInfo.getString("originalId");
-        String orgid = adminOrgUnitInfo.getId().toString();
+        String originalId = adminOrgUnitInfo.getReserveFieldFirst();
+        String orgid = adminOrgUnitInfo.getNumber();
         // 用于存储响应数据的 JSONArray
         JSONArray responseData = new JSONArray();
         // 用于存储响应的 JSONObject
@@ -136,12 +136,14 @@ public class BeiSenUtils {
                 header.put("originalId",orgid);
                 String departmentsput = propt.getProperty("DEPARTMENTSPUT");
                 departmentsput+="?originalId="+ URLEncoder.encode(orgid, "UTF-8");;
-                responseJson = helper.getURL(departmentsput,header, requestBody, "PUT",orgid,"更新","北森");
+                responseJson = helper.getURL(departmentsput,header, requestBody, "PUT",
+                        adminOrgUnitInfo.getId().toString(),"更新","北森");
                 System.out.println("url："+departmentsput);
                 System.out.println("requestBody："+requestBody);
             }else {
                 String departmentspost = propt.getProperty("DEPARTMENTSPOST");
-                responseJson = helper.getURL(departmentspost, header, requestBody, "POST",orgid,"创建","北森");
+                responseJson = helper.getURL(departmentspost, header, requestBody, "POST",
+                        adminOrgUnitInfo.getId().toString(),"创建","北森");
                 System.out.println("url："+propt.getProperty("DEPARTMENTSPOST"));
                 System.out.println("requestBody："+requestBody);
 

websrc/com/kingdee/eas/custom/beisen/syncperson/handler/EmployeeListHandlerEx.java

@@ -1,214 +1,6 @@
 package com.kingdee.eas.custom.beisen.syncperson.handler;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.kingdee.bos.BOSException;
-import com.kingdee.bos.Context;
-import com.kingdee.bos.dao.IObjectCollection;
-import com.kingdee.bos.dao.IObjectValue;
-import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
-import com.kingdee.bos.dao.query.BizEnumValueDTO;
-import com.kingdee.bos.util.BOSUuid;
-import com.kingdee.eas.basedata.org.OrgUnitInfo;
-import com.kingdee.eas.basedata.person.PersonFactory;
-import com.kingdee.eas.basedata.person.PersonInfo;
-import com.kingdee.eas.common.EASBizException;
-import com.kingdee.eas.custom.beisen.synchronousorg.SynchronousEmpBillFactory;
-import com.kingdee.eas.custom.beisen.syncperson.SyncPersonToBeisenFacadeFactory;
 import com.kingdee.eas.hr.emp.web.handler.EmployeeListHandler;
-import com.kingdee.shr.base.syssetting.api.bean.BatchMessageTipsBody;
-import com.kingdee.shr.base.syssetting.api.bean.BatchMessageTipsHeader;
-import com.kingdee.shr.base.syssetting.context.SHRContext;
-import com.kingdee.shr.base.syssetting.exception.SHRWebException;
-import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
-import com.kingdee.shr.base.syssetting.json.adapter.*;
-import com.kingdee.shr.base.syssetting.web.json.adapter.BOSUuidTypeAdapter;
-import com.kingdee.util.StringUtils;
-import com.kingdee.util.enums.Enum;
-import org.springframework.ui.ModelMap;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.Timestamp;
-import java.util.Date;
-
-/**
- * @author 青梧
- * @version 1.0
- * @description: EmployeeListHandlerEx
- * @date 2025/7/23 14:40
- */
 public class EmployeeListHandlerEx extends EmployeeListHandler {
-    /**
-     * 同步人员至北森
-     *
-     * @param request
-     * @param response
-     * @param modelMap
-     * @throws SHRWebException
-     */
-    public void syncPersonToBeisenAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
-        Context ctx = SHRContext.getInstance().getContext();
-        String billId = getBillId(request);
-        try {
-            SyncPersonToBeisenFacadeFactory.getLocalInstance(ctx).syncPerson(billId, 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new ShrWebBizException(e);
-        }
-    }
-
-    /**
-     * 同步北森人员信息
-     *
-     * @param request
-     * @param response
-     * @param modelMap
-     * @return
-     * @throws SHRWebException
-     */
-    public String synBeiSenPersonAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
-        Context ctx = SHRContext.getInstance().getContext();
-        BatchMessageTipsHeader batchMessageTipsHeader = new BatchMessageTipsHeader();
-        String ids = request.getParameter("ids");
-        System.out.println("==========ids："+ids);
-        int sucess = 0;
-        int failure = 0;
-        if (ids != null && ids.length() > 0) {
-            String[] personArray = ids.split(",");
-            for (int i = 0; i < personArray.length; i++) {
-                BatchMessageTipsBody body = new BatchMessageTipsBody();
-                try {
-                    PersonInfo personInfo = PersonFactory.getLocalInstance(ctx).getPersonInfo(new ObjectUuidPK(personArray[i]));
-                    String beisenid = personInfo.getString("beisenid");
-                    System.out.println("==========beisenid："+beisenid);
-                    if (beisenid!=null&&beisenid.length()>0){
-                        try {
-                            String string = personInfo.getString("IsSync");
-                            if (string==null||string.equals("0")){
-                                String s = SynchronousEmpBillFactory.getLocalInstance(ctx).empBill(beisenid, "002", "asdasdasdasdasdasd");
-                                System.out.println("==========s："+s);
-                                body.setId(personArray[i]);
-                                body.setMuitTipsState(true);
-                                body.setMuitTipsMessage("同步成功【" +personInfo.getName() + "】");
-                                batchMessageTipsHeader.addResult(body);
-                                sucess++;
-                            }else {
-                                body.setId(personArray[i]);
-                                body.setMuitTipsState(true);
-                                body.setMuitTipsMessage("已经同步过该数据【" + personInfo.getName() + "】");
-                                batchMessageTipsHeader.addResult(body);
-                                sucess++;
-                            }
-
-                        }catch (Exception e){
-                            System.out.println("==========personArray[i]1："+personArray[i]);
-                            body.setId(personArray[i]);
-                            body.setMuitTipsState(false);
-                            body.setMuitTipsMessage("后台事务执行失败【" + personArray[i] + "】");
-                            batchMessageTipsHeader.addResult(body);
-                            e.printStackTrace();
-                            failure++;
-                        }
-                    }else {
-                        failure++;
-                        System.out.println("==========personArray[i]2："+personArray[i]);
-                        body.setId(personArray[i]);
-                        body.setMuitTipsState(false);
-                        body.setMuitTipsMessage("未查询到北森入职单id【" +personInfo.getName() + "】");
-                        batchMessageTipsHeader.addResult(body);
-                    }
-                } catch (BOSException e) {
-                    System.out.println("==========personArray[i]3："+personArray[i]);
-                    body.setId(personArray[i]);
-                    body.setMuitTipsState(false);
-                    body.setMuitTipsMessage("同步失败查询员工失败【" + personArray[i] + "】");
-                    batchMessageTipsHeader.addResult(body);
-                    e.printStackTrace();
-                } catch (EASBizException e) {
-                    System.out.println("==========personArray[i]4："+personArray[i]);
-                    body.setId(personArray[i]);
-                    body.setMuitTipsState(false);
-                    body.setMuitTipsMessage("同步失败查询员工失败【" + personArray[i] + "】");
-                    batchMessageTipsHeader.addResult(body);
-                    e.printStackTrace();
-                }
-            }
-        }
-        batchMessageTipsHeader.setBillId(ids);
-        batchMessageTipsHeader.setFailureCount(failure);
-        batchMessageTipsHeader.setSuccessCount(sucess);
-        System.out.println("=========batchMessageTipsHeader："+batchMessageTipsHeader.toString());
-        SUCCESS(batchMessageTipsHeader,request,response,"application/json;charset=UTF-8",ctx);
-        return null;
-    }
-    public static void SUCCESS(Object object,ServletRequest request, ServletResponse response, String contentType,Context context) throws SHRWebException {
-        response.setContentType(contentType);
-
-        PrintWriter pw;
-        try {
-            pw = response.getWriter();
-        } catch (IOException var7) {
-            throw new SHRWebException("can't open the output stream!");
-        }
-
-        StringBuilder strSuccessJson = new StringBuilder();
-        strSuccessJson.append("{");
-        strSuccessJson.append("\"result\":\"");
-        strSuccessJson.append("success");
-        strSuccessJson.append("\",\"data\":");
-        strSuccessJson.append(convertObjectToJson(context, object).toString());
-        String successMessage = (String)request.getAttribute("successMessage");
-        if (!StringUtils.isEmpty(successMessage)) {
-            strSuccessJson.append(",\"successMessage\":\"");
-            strSuccessJson.append(successMessage);
-            strSuccessJson.append("\"");
-        }
-
-        strSuccessJson.append("}");
-        pw.flush();
-        pw.write(strSuccessJson.toString());
-        pw.flush();
-    }
-    public static String convertObjectToJson(Context ctx, Object object) {
-        if (object != null && !object.equals("")) {
-            Gson gson = getGson(ctx);
-            String result = gson.toJson(object);
-            if (result == null) {
-                return "\"\"";
-            } else {
-                result = processJsonResult(result);
-                return result;
-            }
-        } else {
-            return "\"\"";
-        }
-    }
-    public static Gson getGson(Context ctx) {
-        GsonBuilder builder = new GsonBuilder();
-        builder.serializeNulls();
-        builder.disableHtmlEscaping();
-        builder.serializeSpecialFloatingPointValues();
-        builder.registerTypeHierarchyAdapter(Date.class, new DateTypeAdapter());
-        builder.registerTypeHierarchyAdapter(Timestamp.class, new DateTypeAdapter());
-        builder.registerTypeHierarchyAdapter(BOSUuid.class, new BOSUuidTypeAdapter());
-        builder.registerTypeHierarchyAdapter(IObjectValue.class, new BosObjectTypeAdapter(ctx));
-        builder.registerTypeHierarchyAdapter(IObjectCollection.class, new BosObjectCollectionTypeAdapter(ctx));
-        builder.registerTypeHierarchyAdapter(OrgUnitInfo.class, new BosObjectTypeAdapter(ctx));
-        builder.registerTypeHierarchyAdapter(BizEnumValueDTO.class, new BizEnumAdapter());
-        builder.registerTypeHierarchyAdapter(Enum.class, new EnumTypeAdapter());
-        return builder.create();
-    }
-    public static String processJsonResult(String result) {
-        result = result.replace("${quote_2312415321232}", "\"");
-        result = result.replace("\"${leftbracket_2312415321232}", "{");
-        result = result.replace("${leftbracket_2312415321232}", "{");
-        result = result.replace("${rightbracket_2312415321232}\"", "}");
-        result = result.replace("${rightbracket_2312415321232}", "}");
-        return result;
-    }
 }

websrc/com/kingdee/eas/custom/esign/service/GetESignConfigDataService.java

@@ -22,6 +22,7 @@ import com.kingdee.eas.custom.esign.bizEnum.ComponentTypeEnum;
 import com.kingdee.eas.custom.esign.utils.ESignFieldMappingUtils;
 import com.kingdee.eas.fi.arap.util.DBUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
+import com.kingdee.shr.base.syssetting.BaseItemStateEnum;
 import com.kingdee.util.enums.Enum;
 
 import java.sql.SQLException;
@@ -103,6 +104,18 @@ public class GetESignConfigDataService implements IHRMsfService {
             eSignSql = eSignSql.replace("{{filed}}",sqlField.toString());
             // 在SQL末尾添加过滤条件（换行分隔，便于阅读）
             eSignSql += "\n"+filter;
+            String sqlStr = dataSource.getSqlStr();//数据源给主表配置的过滤调整
+            if(sqlStr!=null && !sqlStr.equals("")){
+                try {
+                    FilterInfo sqlStrFilter = new FilterInfo(sqlStr);
+                    eSignSql += "\n and "+sqlStrFilter.toString();
+                } catch (ParserException e) {
+                    System.out.println("sqlStr"+sqlStr+"：解析异常");
+                    e.printStackTrace();
+                }
+
+            }
+            System.out.println("=====sql====="+eSignSql.toString());
             // 执行SQL查询并将结果封装为JSON对象（包含字段映射关系）
             JSONObject data = this.getData(eSignSql, context, entrys,eSignTemplateNum);
             System.out.println("=====data====="+data.toString());
@@ -158,6 +171,11 @@ public class GetESignConfigDataService implements IHRMsfService {
                     ESignTemplateFileEntryInfo template = fieldMappingEntryInfo.getTemplate();
                     // 获取电子签模板的ID
                     String eSignTemplateId = template.getESignTemplateId();
+
+                    BaseItemStateEnum state = template.getState();
+                    if (state!=BaseItemStateEnum.ENABLE){
+                        continue;
+                    }
                     // 从JSON对象中获取该模板ID对应的子JSON对象
                     JSONObject  templateJSON = jsonObject.getJSONObject(eSignTemplateId);
                     // 若模板对应的子JSON对象不存在，则创建并初始化（设置ID和名称）
@@ -293,6 +311,8 @@ public class GetESignConfigDataService implements IHRMsfService {
             filterInfo.getFilterItems().add(new FilterItemInfo("Invalid",1, CompareType.NOTEQUALS));
             // 添加过滤条件：父级的父级ID等于电子签模板ID
             filterInfo.getFilterItems().add(new FilterItemInfo("Parent1.Parent.id",id));
+
+            filterInfo.getFilterItems().add(new FilterItemInfo("Parent1.state", BaseItemStateEnum.ENABLE,CompareType.EQUALS));
             // 为实体视图设置过滤条件
             entityViewInfo.setFilter(filterInfo);
             // 根据实体视图查询电子签模板字段明细集合
@@ -342,7 +362,7 @@ public class GetESignConfigDataService implements IHRMsfService {
                 field.put("dataType",componentType.getAlias());
                 field.put("dataFormat",eFile.getDataFormat());
                 field.put("isRequired",eFile.isRequired());
-                field.put("seq",eFile.getSeq());
+                field.put("seq",eFile.getComponentOrder());
                 // 字段值暂设为null
                 field.put("value",null);
             }