#EC_HJ149# 上线代码提交

src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java

@@ -254,13 +254,14 @@ public class SendPortalWithAddDoneCmd {
                         bb.writeLog("creater2:"+creater);
 
                         String nodeName = Util.null2String(doneMap.get("nodename"));
-                        String nodeid = Util.null2String(doneMap.get("noedid"));
+//                        String nodeid = Util.null2String(doneMap.get("noedid"));
-                        bb.writeLog("nodeid:"+nodeid);
+//                        bb.writeLog("nodeid:"+nodeid);
+//                        if(StringUtils.isBlank(nodeid)){
+//                            nodeid = requestid+userid; ;
+//                        }
+//                        bb.writeLog("nodeid2:"+nodeid);
 
-                        if(StringUtils.isBlank(nodeid)){
+                        String nodeid = requestid+userid;
-                            nodeid = requestid+userid; ;
-                        }
-                        bb.writeLog("nodeid2:"+nodeid);
 
                         JSONObject requestObject = new JSONObject();
                         requestObject.put("center", center);

src/com/engine/dito/reqremark/cmd/RequestRemarkArchivedCmd.java

@@ -292,6 +292,8 @@ public class RequestRemarkArchivedCmd extends AbstractCommonCommand<Map<String,O
                         }
                     }
                 }
+            }else{
+                resultCode = "0";
             }
         } catch (Exception e) {
             bb.writeLog("sendRemarkArchivedPortalDoneData-e:"+e);

src/weaver/interfaces/dito/monitor/SendPortalMonitorUtil.java

@@ -680,7 +680,7 @@ public class SendPortalMonitorUtil {
                             "  from workflow_requestbase t1\n" +
                             "  inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
                             "  where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
-                            "  and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','8','9','7','11')) \n" +
+                            "  and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','7','11')) \n" +
                             "  and t2.islasttimes = 1\n" +
                             "  and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
                             "  and t2.requestid = "+requestid ;
@@ -741,7 +741,7 @@ public class SendPortalMonitorUtil {
                         "  left join (select id, lastname,loginid,email from hrmresource where STATUS = 1 union all select id,lastname,loginid,'' as email from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
                         "  left join workflow_nodebase d1 on d1.id = t2.nodeid "+
                         "  where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
-                        "  and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','8','9','7','11')) \n" +
+                        "  and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','7','11')) \n" +
                         "  and t2.islasttimes = 1 \n" +
                         "  and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
                         "  and t2.requestid = "+requestid ;