diff --git a/.idea/haojing.iml b/.idea/haojing.iml index 8a4a19f0..e6bb3eef 100644 --- a/.idea/haojing.iml +++ b/.idea/haojing.iml @@ -1,5 +1,18 @@ + + + + + + + diff --git a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java index 33097cfb..219a6759 100644 --- a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java @@ -7,6 +7,7 @@ import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; +import weaver.interfaces.dito.comInfo.PropBean; import java.net.URLEncoder; import java.util.regex.Matcher; @@ -16,6 +17,8 @@ public class SendPortalTodoUtil { //public static String EMAIL_REGEX_DEFAULT = "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$"; public static String EMAIL_REGEX_DEFAULT = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$"; + //cus_fielddata存储的staffid字段名 + private String staffIdFieldByCus = PropBean.getUfPropValue("staffIdFieldByCus"); /*** * 流程发起节点,发起保存不提交,发起节点有待办,下个节点没有待办 * @param requestId @@ -47,11 +50,12 @@ public class SendPortalTodoUtil { try { int userid = user.getUID(); String sql =" select t1.workflowid,t1.requestname,t1.requestmark,t1.creater,t2.nodeid,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" + - " t1.requestid as taskcode,d1.nodename,h1.email\n" + + " t1.requestid as taskcode,d1.nodename,h1.email,c1."+staffIdFieldByCus+" as staffid"+ " from workflow_requestbase t1\n" + " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " LEFT JOIN cus_fielddata c1 on c1.ID=t2.USERID"+ " 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 = t1.creater\n" + " where t2.userid in ("+userid+") \n" + " and (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + @@ -64,6 +68,7 @@ public class SendPortalTodoUtil { bb.writeLog("sendTodoDataByCreater-sql:"+sql); rs.executeQuery(sql); if (rs.next()){ + objectId = rs.getString("staffid"); String workflowid = Util.null2String(rs.getString("workflowid")) ; String workflowname = getWorkflowname(workflowid); String title = Util.null2String(rs.getString("requestname")) ; @@ -202,10 +207,11 @@ public class SendPortalTodoUtil { try { JSONArray taskObjectList = new JSONArray(); String sql =" select t1.workflowid,t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" + - " t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" + + " t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename,c1."+staffIdFieldByCus+" as staffid"+ " from workflow_requestbase t1\n" + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " LEFT JOIN cus_fielddata c1 on c1.ID=t1.creater"+ " left join (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t1.creater\n" + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + " and t1.requestid = "+requestid ; @@ -213,6 +219,7 @@ public class SendPortalTodoUtil { bb.writeLog("sendTodoDataByNode--sql:"+sql); rs.executeQuery(sql); if (rs.next()){ + objectId = rs.getString("staffid"); String workflowid = Util.null2String(rs.getString("workflowid")) ; String workflowname = getWorkflowname(workflowid); String title = Util.null2String(rs.getString("requestname")) ; @@ -371,6 +378,7 @@ public class SendPortalTodoUtil { " from workflow_requestbase t1\n" + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " LEFT JOIN cus_fielddata c1 on c1.ID=t1.creater"+ " left join (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t1.creater\n" + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + " and t1.requestid = "+requestid ; @@ -385,6 +393,7 @@ public class SendPortalTodoUtil { rs.executeQuery(sql); if (rs.next()){ + objectId = rs.getString("staffid"); String workflowid = Util.null2String(rs.getString("workflowid")) ; String workflowname = getWorkflowname(workflowid); String title = Util.null2String(rs.getString("requestname")) ;