diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java index be0b65c..fc254f4 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java @@ -76,7 +76,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler { return; }*/ // 发送首节的已办 - sendToDo(ctx); + sendToDo(ctx,todoInfo); } catch (Exception e) { logger.info("###获得缓存失败,发送首节的已办失败:" + e.getMessage()+" ctx:"+ctx.toString()+" ctx.getBusinessKey:"+ctx.getBusinessKey()); } @@ -140,7 +140,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler { * 首节已办数据发送 * @param ctx 信息 */ - private void sendToDo(MessageContext ctx) { + private void sendToDo(MessageContext ctx,ToDoInfo todoInfo) { logger.info("###进入首节已办推送方法"); String accountId = System.getProperty("backlog-accountid"); Object shkd_type = SystemParamServiceHelper.getPublicParameter("shkd_type"); @@ -245,7 +245,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler { throw new KDException(errorCode, e); } //判断是否移动端 - boolean allowMobApprove = allowMobApprove(next.get("fid")); + boolean allowMobApprove = allowMobApprove(ctx,todoInfo); if (allowMobApprove) { continue; } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/utils/MobApproveListServiceHelper.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/utils/MobApproveListServiceHelper.java index e824032..a8aed54 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/utils/MobApproveListServiceHelper.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/utils/MobApproveListServiceHelper.java @@ -70,12 +70,12 @@ public class MobApproveListServiceHelper { public static boolean allowMobApprove(Object taskId){ DynamicObject object = BusinessDataServiceHelper.loadSingleFromCache("wf_hitaskinst", - "entitynumber,entityname,taskdefkey", + "entitynumber,entityname,taskdefinitionkey", new QFilter[]{new QFilter("id", "=", taskId)}); if(object != null){ String entityNumber = object.getString("entitynumber"); String billType = object.getString("entityname"); - String elementId = object.getString("taskdefkey"); + String elementId = object.getString("taskdefinitionkey"); int i = elementId.lastIndexOf("_"); //流程 String procDefNumber = elementId.substring(0, i);