diff --git a/src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java b/src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java
index 83f25812..fb230ae3 100644
--- a/src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java
+++ b/src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java
@@ -77,7 +77,7 @@ public class SendPortalWithAddTodoCmd {
 
         String terminal = "1" ;
         String taskType = "0";
-        String actionType = "0" ;
+        String actionType = "1" ;
         String objectAction = "0" ;
         String objectType = "0";
 
@@ -312,6 +312,11 @@ public class SendPortalWithAddTodoCmd {
                         String resultCode = msgObject.getString("resultCode");
                         if("0".equals(resultCode)){
                             map.put("resultCode","0");
+                        }else if ("TODO-FAIL-001".equals(resultCode)){
+//                            requestObject.put("actionType","2");
+//                            bb.writeLog("after  TODO-FAIL-001 sendTodoDataByNode---requestObject:"+requestObject.toJSONString());
+//                            String msg= httpRequestUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
+//                            bb.writeLog("after TODO-FAIL-001"+msg);
                         }else{
                             bb.writeLog(msgObject.get("resultMsg"));
                             map.put("resultCode",resultCode);
diff --git a/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java b/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java
index 6dfc4016..4bd7ad6b 100644
--- a/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java
+++ b/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java
@@ -341,6 +341,9 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
         RecordSet rs = new RecordSet();
         String ticketType = center ;
         String terminal = "1" ;
+        String scopeid = "-1";
+        String scope = "HrmCustomFieldByInfoType" ;
+        String cus_staff = PropBean.getUfPropValue("cus_staff") ;
         try {
 
             String currentnodetype = "" ;
@@ -356,10 +359,10 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
             }else{
 
                 String actionType = "1" ;
-
+    //            String actionType = "0" ;
                 JSONArray taskObjectList = new JSONArray();
 
-                sql =   " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
+                sql =   " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,h1.id,\n" +
                         "       t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" +
                         "       from workflow_requestbase t1\n" +
                         "       inner join workflow_base t3 on t1.workflowid = t3.id\n" +
@@ -373,13 +376,13 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
 
                     String title = Util.null2String(rs.getString("requestname")) ;
                     String creator = Util.null2String(rs.getString("loginid")) ;
+                    String userId = Util.null2String(rs.getString("id")) ;
                     String taskCode = Util.null2String(rs.getString("taskcode")) ;
                     String nodeId = Util.null2String(rs.getString("nodeid")) ;
 
                     String createdate = Util.null2String(rs.getString("createdate")) ;
                     String createtime = Util.null2String(rs.getString("createtime")) ;
-                    String messageTitle = Util.null2String(rs.getString("requestname")) ;
-//                    messageTitle = getShortMessageTitle(messageTitle);
+                    String messageTitle = getShortMessageTitle(rs.getString("requestname")) ;
                     String messageContent = Util.null2String(rs.getString("requestname")) ;
 
                     String taskType = "0";
@@ -400,8 +403,9 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
                     requestObject.put("center",center);
                     requestObject.put("title",title);
                     requestObject.put("creator",creator);
+                    //requestObject.put("taskCode",taskCode+"_zf_"+userId);
                     requestObject.put("taskCode","weaver"+taskCode);
-                    requestObject.put("nodeId",nodeId);
+                    requestObject.put("nodeId",nodeId+userId);
                     requestObject.put("taskType",taskType);
                     requestObject.put("actionType",actionType);
                     requestObject.put("createDate",createdate+" "+createtime);
@@ -415,9 +419,10 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
                     requestObject.put("ticketType",ticketType);
                 }
 
-                sql =   "  select t2.userid,h1.loginid\n" +
+                sql =   "  select t2.userid,h1.loginid,c1."+cus_staff+" as staffid "+
                         "  from workflow_requestbase t1\n" +
                         "    inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
+                        "  left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+
                         "    left join (select id, lastname,loginid from hrmresource where STATUS = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
                         "  where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
                         "  and t2.isremark = '1' \n" +
@@ -433,7 +438,7 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
                     String objectAction = "0" ;
                     String objectType = "0";
                     String objectCode = usercode ;
-                    String objectId = "" ;
+                    String objectId = rs.getString("staffid") ;
                     String operatorCode = usercode ;
 
                     taskObject.put("objectAction",objectAction);
@@ -478,5 +483,11 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
 //        }
 //        return messageTitle;
 //    }
+    private String getShortMessageTitle(String messageTitle) {
+        if (messageTitle.length() > 20) {
+            messageTitle = messageTitle.substring(0, 17) + "...";
+        }
+        return messageTitle;
+    }
 
 }