修改待办下拉逻辑

src/main/java/com/uas/core/config/WebServiceClient.java

@@ -52,9 +52,9 @@ public class WebServiceClient {
 		factory.setAddress(address);
 		
 		// 使用MTOM编码处理消息。如果需要在消息中传输文档附件等二进制内容，请加入此段代码
-		 /*Map<String, Object> props = new HashMap<String, Object>();
+		 Map<String, Object> props = new HashMap<String, Object>();
 		 props.put("mtom-enabled", Boolean.TRUE);
-		 factory.setProperties(props);*/
+		 factory.setProperties(props);
         
         // 创建服务代理并返回
 		return factory.create();

src/main/java/com/uas/service/Impl/ISegHetongServiceImpl.java

@@ -89,7 +89,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
             while (rs.next()) {
                 SegHetongParamterForm form = new SegHetongParamterForm();
                 // 文档模板id
-                form.setFdTemplateId("179c1d56981bbbbd8be7de04ca2877d5");
+                form.setFdTemplateId("176a74ab307f6bef68bf6be4bd8a9e4a");
 
                 // 文档标题
                 form.setDocSubject("合同审批");
@@ -99,6 +99,8 @@ public class ISegHetongServiceImpl implements ISegHetongService {
 
                 // 文档关键字
                 form.setFdKeyword("[\""+rs.getString("ct_varchar50_4")+"\"]");
+                form.setDocStatus("20");
+                form.setFlowParam(new JSONObject().toString());
                 List<AttachmentForm> attachmentForms = form.getAttachmentForms();
 
 
@@ -128,7 +130,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                     //把重复的id去掉
                     Set<String> idSet = new HashSet<String>(Arrays.asList(idArr));
                     for(String ids:idSet) {
-                        AttachmentForm att = createAtt(ids, "fd_3604df162c55b2");
+                        AttachmentForm att = createAtt(ids, "fd_3604deeda0668c");
                         attachmentForms.add(att);
                     }
                 }
@@ -139,7 +141,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                     //把重复的id去掉
                     Set<String> idSet = new HashSet<String>(Arrays.asList(idArr));
                     for(String ids:idSet) {
-                        AttachmentForm att = createAtt(ids, "fd_3604deeda0668c");
+                        AttachmentForm att = createAtt(ids, "fd_3604e51f9942c0");
                         attachmentForms.add(att);
                     }
                 }
@@ -201,34 +203,34 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                     strings.add(rowSet.getString("jn_dealresult"));
                     array.add(strings);
                 }
-                json.put("fd_37ebd5beecf894",array.toString());
-                form.setFormValues(json.toString());
+                json.put("fd_37ebd5beecf894",array);
                 String varchar5005 = rs.getString("ct_varchar500_5");
                 SqlRowList rowList = baseDao.queryForRowSet("select ig_item1,ig_item2,ig_item3,ig_item4 from itemgrid" +
                         " where nvl(ig_item1,' ')<>' ' and ig_mainid=" + varchar5005);
                 JSONArray jsonArray = new JSONArray();
                 while (rowList.next()){
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("fd_36e4452e5e67f2",rs.getString("ig_item1"));
-                    jsonObject.put("fd_35ed1cbb52a108",rs.getString("ig_item2"));
-                    jsonObject.put("fd_35ed13a94684a8",rs.getString("ig_item3"));
-                    jsonObject.put("fd_35ed133ea9aa74",rs.getString("ig_item4"));
+                    jsonObject.put("fd_36e4452e5e67f2",rowList.getString("ig_item1"));
+                    jsonObject.put("fd_35ed1cbb52a108",rowList.getString("ig_item2"));
+                    jsonObject.put("fd_35ed13a94684a8",rowList.getString("ig_item3"));
+                    jsonObject.put("fd_35ed133ea9aa74",rowList.getString("ig_item4"));
                     jsonArray.add(jsonObject);
                 }
-                json.put("fd_35ed12c9fca3ca",jsonArray.toString());
+                json.put("fd_35ed12c9fca3ca",jsonArray);
                 int ct_id = rs.getInt("ct_id");
                 SqlRowList sqlRowList = baseDao.queryForRowSet("select to_char(cd_date_1,'yyyy-MM-dd HH24:mi:ss') " +
                         "cd_date_1,cd_varchar50_1,cd_varchar50_2,cd_varchar50_3 from customtabledetail where cd_ctid=" + ct_id);
                 JSONArray jsonArr = new JSONArray();
                 while (sqlRowList.next()){
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("fd_3759c2d18852a0",rs.getString("cd_date_1"));
-                    jsonObject.put("fd_3759c2d33f14d0",rs.getGeneralDouble("cd_varchar50_1"));
-                    jsonObject.put("fd_3759c2e9805608",rs.getGeneralDouble("cd_varchar50_2"));
-                    jsonObject.put("fd_3759c3010a51ea",rs.getString("cd_varchar50_3"));
+                    jsonObject.put("fd_3759c2d18852a0",sqlRowList.getString("cd_date_1"));
+                    jsonObject.put("fd_3759c2d33f14d0",sqlRowList.getGeneralDouble("cd_varchar50_1"));
+                    jsonObject.put("fd_3759c2e9805608",sqlRowList.getGeneralDouble("cd_varchar50_2"));
+                    jsonObject.put("fd_3759c3010a51ea",sqlRowList.getString("cd_varchar50_3"));
                     jsonArr.add(jsonObject);
                 }
-                json.put("fd_3759c29b9e5210",jsonArr.toString());
+                json.put("fd_3759c29b9e5210",jsonArr);
+                form.setFormValues(json.toString());
             /*List<AttachmentForm> attForms = createAllAtts();*/
            /* form.getAttachmentForms().add();*/
                 String s = syncHTSPData(form);

src/main/java/com/uas/service/Impl/SyncOrgElementsBaseInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.service.Impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.landray.kmss.sys.organization.webservice.in.ISysSynchroSetOrgWebService;
@@ -86,7 +87,7 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
     private JSONArray getOrgJsonData(String type){
         JSONArray resultArray = new JSONArray();
         // 《组织》 数据对象
-        SqlRowList orgs = baseDao.queryForRowSet("select row_number() over (order by or_id) rn, case when nvl(or_landrayid,' ')=' ' then to_char(or_id) else or_landrayid end or_id,or_code,or_name,or_subof ,or_parentname,or_headmancode,or_headmanname,or_path, (select or_headmanname from hrorg ho where ho.or_id=hr.or_subof) as superleader from hrorg hr order by or_id");
+        SqlRowList orgs = baseDao.queryForRowSet("select row_number() over (order by or_id) rn, case when nvl(or_landrayid,' ')=' ' then to_char(or_id) else or_landrayid end or_id,or_code,or_name,or_subof ,or_parentname,or_headmancode,or_headmanname,or_path, (select case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end from hrorg ho left join employee on ho.or_headmancode=em_code where ho.or_id=hr.or_subof) as superleader,or_statuscode,or_landraysubid,to_char(or_subof) or_subof,case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end emid from hrorg hr left join employee on hr.or_headmancode=em_code order by or_id");
         while (orgs.next()) {
             JSONObject orgObj = new JSONObject();
             orgObj.put("id", orgs.getGeneralString("or_id")); // 唯一标识 (不允许为空)
@@ -97,16 +98,23 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
             orgObj.put("order", orgs.getGeneralString("rn")); // 排序号 (可为空)
             orgObj.put("keyword", ""); // 关键字 (内容格式不限制，可为空)
             if ("详情".equals(type)) {
-                orgObj.put("parent", orgs.getGeneralString("or_parentname")); // 父组织 (可为空)
-                orgObj.put("thisleader", orgs.getGeneralString("or_headmanname")); // 组织架构领导 (可为空)
+                String landraysubid = orgs.getObject("or_landraysubid") == null ? orgs.getGeneralString("or_subof") : orgs.getGeneralString("or_landraysubid");
+                orgObj.put("parent", landraysubid); // 父组织 (可为空)
+                orgObj.put("thisleader", orgs.getGeneralString("emid")); // 组织架构领导 (可为空)
                 orgObj.put("memo", orgs.getGeneralString("or_path")); // 组织架构说明 (可为空)
                 orgObj.put("superleader", orgs.getGeneralString("superleader")); // 组织上级上级领导 (可为空)
-                orgObj.put("isAvailable", true); // 是否有效,该属性决定该组织架构是否删除
+                String statuscode = orgs.getObject("or_statuscode") == null ? "" : orgs.getGeneralString(
+                        "or_statuscode");
+                if ("AUDITED".equals(statuscode)) {
+                    orgObj.put("isAvailable", true); // 是否有效,该属性决定该部门架构是否删除
+                }else {
+                    orgObj.put("isAvailable", false);
+                }
             }
             resultArray.add(orgObj); // 组织机构
         }
         // 《部门》 数据对象
-        SqlRowList depts = baseDao.queryForRowSet("select row_number() over (order by dp_level) rn,case when nvl(dp_landrayid,' ')=' ' then to_char(dp_id) else Dp_Landrayid end dp_id, dp_code, dp_name, dp_status, dp_headmancode, dp_headmanname, dp_subof, dp_isleaf, dp_parentdpname, dp_level,(select dp_headmanname from department dp where dp_statuscode='AUDITED' and dp.dp_id=dept.dp_subof) as superleader from department dept where dp_statuscode='AUDITED' order by dp_level");
+        SqlRowList depts = baseDao.queryForRowSet("select row_number() over (order by dp_level) rn,case when nvl(dp_landrayid,' ')=' ' then to_char(dp_id) else Dp_Landrayid end dp_id, dp_code, dp_name, dp_status, dp_headmancode, dp_headmanname, dp_subof, dp_isleaf, dp_parentdpname, dp_level,(select case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end from department dp left join employee on em_code=dp.dp_headmancode where dp.dp_id=dept.dp_subof) as superleader,dp_statuscode,dp_landraysubid,to_char(dp_subof) dp_subof,case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end em_id from department dept left join employee on em_code=dept.dp_headmancode order by dp_level");
         while (depts.next()) {
             JSONObject deptObj = new JSONObject();
             deptObj.put("id", depts.getGeneralString("dp_id")); // 唯一标识 (不允许为空)
@@ -117,19 +125,25 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
             deptObj.put("order", depts.getGeneralString("rn")); // 排序号 (可为空)
             deptObj.put("keyword", ""); // 关键字 (内容格式不限制，可为空)
             if ("详情".equals(type)) {
-                deptObj.put("parent", depts.getGeneralString("dp_parentdpname")); // 父部门 (可为空)
-                deptObj.put("thisleader", depts.getGeneralString("dp_headmanname")); // 部门架构领导 (可为空)
+                String landraysubid = orgs.getObject("dp_landraysubid") == null ? orgs.getGeneralString("dp_subof") : orgs.getGeneralString("dp_landraysubid");
+                deptObj.put("parent", landraysubid); // 父部门 (可为空)
+                deptObj.put("thisleader", depts.getGeneralString("em_id")); // 部门架构领导 (可为空)
                 int level = depts.getGeneralInt("dp_level");
                 String memo = depts.getGeneralInt("or_path") == 0 ? "不是末级部门，部门层级" + level : "是末级部门，部门层级" + level;
                 deptObj.put("memo", memo); // 部门架构说明 (可为空)
                 deptObj.put("superleader", depts.getGeneralString("superleader")); // 部门上级领导 (可为空)
-                deptObj.put("isAvailable", true); // 是否有效,该属性决定该部门架构是否删除
+                String statuscode = depts.getObject("dp_statuscode") == null ? "" : depts.getGeneralString("dp_statuscode");
+                if ("AUDITED".equals(statuscode)) {
+                    deptObj.put("isAvailable", true); // 是否有效,该属性决定该部门架构是否删除
+                }else {
+                    deptObj.put("isAvailable", false);
+                }
             }
             resultArray.add(deptObj); // 部门
         }
 
         // 《岗位》 数据对象
-        SqlRowList posts = baseDao.queryForRowSet("select row_number() over (order by jo_level) rn,jo_id joid,case when nvl(jo_landrayid,' ')=' ' then to_char(jo_id) else jo_landrayid end jo_id, jo_code, jo_name, jo_orgid, jo_orgname, jo_headmancode, jo_headmanname , jo_subof, jo_parentname, jo_level, jo_emptype from job where jo_statuscode='AUDITED' order by jo_level");
+        SqlRowList posts = baseDao.queryForRowSet("select row_number() over (order by jo_level) rn,jo_id joid,case when nvl(jo_landrayid,' ')=' ' then to_char(jo_id) else jo_landrayid end jo_id, jo_code, jo_name, jo_orgid, jo_orgname, jo_headmancode, jo_headmanname , to_char(jo_subof) jo_subof, jo_parentname, jo_level, jo_emptype,jo_statuscode,jo_landraysubid,case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end emid from job left join employee on em_code=jo_headmancode order by jo_level");
         while (posts.next()) {
             JSONObject postObj = new JSONObject();
             postObj.put("id", posts.getGeneralString("jo_id")); // 唯一标识 (不允许为空)
@@ -140,28 +154,34 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
             postObj.put("order", posts.getGeneralString("rn")); // 排序号 (可为空)
             postObj.put("keyword", ""); // 关键字 (内容格式不限制，可为空)
             if ("详情".equals(type)) {
-                postObj.put("parent", posts.getGeneralString("jo_parentname")); // 父部门 (可为空)
-                postObj.put("thisleader", posts.getGeneralString("jo_headmanname")); // 部门架构领导 (可为空)
+                String landraysubid = orgs.getObject("jo_landraysubid") == null ? orgs.getGeneralString("jo_subof") : orgs.getGeneralString("jo_landraysubid");
+                postObj.put("parent", landraysubid); // 父部门 (可为空)
+                postObj.put("thisleader", posts.getGeneralString("emid")); // 部门架构领导 (可为空)
                 int level = posts.getGeneralInt("jo_level");
                 String memo = posts.getObject("jo_orgname") == null ? "岗位层级" + level : "所属组织" + posts.getGeneralString("jo_orgname") + "，岗位层级" + level;
                 postObj.put("memo", memo); // 岗位架构说明 (可为空)
-                List<String> data = baseDao.query("select case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) " +
-                        "else em_landrayemid end em_id from employee where em_class<>'离职' and nvl(em_islandray,0)=-1 " +
-                        "and (em_landrayjoid='" + posts.getString("jo_id")+"' or em_defaulthsid="+posts.getGeneralInt("joid")+")", String.class);
-                String[] persons =new String[]{};
+                List<String> data = baseDao.queryForList("select case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end from employee where em_class<>'离职' and nvl(em_islandray,0)=-1 and  em_defaulthsid="+posts.getGeneralInt("joid"), String.class);
+
+                JSONArray  persons=null;
                 if (data != null && data.size() > 0) {
-                    persons = data.toArray(new String[data.size()]);
+                    persons =JSONArray.parseArray(JSON.toJSONString(data));
 
                 }
                 postObj.put("persons", persons); // 岗位包含人员 (可为空)
-                postObj.put("isAvailable", true); // 是否有效,该属性决定该岗位是否删除
+                String statuscode = posts.getObject("jo_statuscode") == null ? "" : posts.getGeneralString(
+                        "jo_statuscode");
+                if ("AUDITED".equals(statuscode)) {
+                    postObj.put("isAvailable", true); // 是否有效,该属性决定该部门架构是否删除
+                }else {
+                    postObj.put("isAvailable", false);
+                }
             }
             resultArray.add(postObj); // 岗位
         }
 
 
         // 《人员》 数据对象
-        SqlRowList persons = baseDao.queryForRowSet("select rn,em_id emid,case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end em_id,em_code,em_name,em_password,em_mobile, em_email,em_cardcode,em_departmentcode,em_depart,em_position,em_defaulthsid from (select row_number() over (order by em_id) rn,em_id,em_code,em_name,em_password,em_mobile, em_email,em_cardcode,em_departmentcode,em_depart,em_position,em_defaulthsid,em_landrayemid from employee where em_class<>'离职' and nvl(em_islandray,0)=-1 order by em_id) where rn<=10");
+        SqlRowList persons = baseDao.queryForRowSet("select row_number() over (order by em_id) rn,em_id emid,case when nvl(em_landrayemid,' ')=' ' then to_char(em_id) else em_landrayemid end em_id,em_code,em_name,em_password,em_mobile, em_email,em_cardcode,em_departmentcode,em_depart,em_position,em_defaulthsid,em_landrayemid,em_class,case when nvl(dp_landrayid,' ')=' ' then to_char(dp_id) else Dp_Landrayid end dp_id from employee left join department on em_departmentcode=dp_code where nvl(em_islandray,0)=-1 order by em_id");
         while (persons.next()) {
             JSONObject personObj = new JSONObject();
             // 唯一标识 (不允许为空)
@@ -173,15 +193,19 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
             personObj.put("order", persons.getGeneralString("rn")); // 排序号 (可为空)
             personObj.put("keyword", persons.getGeneralString("em_name")); // 关键字 (内容格式不限制，可为空)
             if ("详情".equals(type)) {
-                personObj.put("isAvailable", true); // 是否有效,该属性决定该人员是否删除
+                String statuscode = persons.getObject("em_class") == null ? "" : persons.getGeneralString("em_class");
+                if ("离职".equals(statuscode)) {
+                    personObj.put("isAvailable", false); // 是否有效,该属性决定该部门架构是否删除
+                }else {
+                    personObj.put("isAvailable", true);
+                }
                 personObj.put("memo", persons.getGeneralString("rn")); // 人员说明 (可为空)
-                personObj.put("parent", persons.getGeneralString("em_depart")); // 所在部门 (可为空)
+                personObj.put("parent", persons.getGeneralString("dp_id")); // 所在部门 (可为空)
                 List<String> data =
-                        baseDao.query("select case when nvl(jo_landrayid,' ')=' ' then to_char(jo_id) else jo_landrayid end from empsjobs left join job on job_id=jo_id  where emp_id=" + persons.getGeneralInt("emid"), String.class);
-                String[] jobs =new String[]{};
+                        baseDao.queryForList("select case when nvl(jo_landrayid,' ')=' ' then to_char(jo_id) else jo_landrayid end from empsjobs left join job on job_id=jo_id  where emp_id=" + persons.getGeneralInt("emid"), String.class);
+                JSONArray  jobs=null;
                 if (data != null && data.size() > 0) {
-                    data.add(persons.getGeneralString("jo_landrayid"));
-                    jobs = data.toArray(new String[data.size()]);
+                    jobs =JSONArray.parseArray(JSON.toJSONString(data));
 
                 }
                 personObj.put("posts", jobs); // 所属岗位
@@ -242,6 +266,8 @@ public class SyncOrgElementsBaseInfoServiceImpl implements SyncOrgElementsBaseIn
         JSONArray orgJsonData = getOrgJsonData("详情");
         // 将组织数据设置到组织架构信息接入上下文
         setOrgContext.setOrgJsonData(orgJsonData.toString());
+        logger.info(orgJsonData.toString());
+        logger.info(setOrgContext.toString());
         try {
             // 调用 WebService 接口，并接收请求返回的数据
             SysSynchroSetResult result = syncOrgElements(setOrgContext);

src/main/java/com/uas/service/Impl/SysNotifyTodoWebServiceImpl.java

@@ -71,9 +71,7 @@ public class SysNotifyTodoWebServiceImpl implements SysNotifyTodoWebService {
      */
     @Override
     public void getNotifyData(){
-        SqlRowList persons = baseDao.queryForRowSet("select row_number() over (order by em_id) rn,em_id,em_code," +
-                "em_name,em_password,em_mobile, em_email,em_cardcode,em_departmentcode,em_depart,em_position," +
-                "em_defaulthsid from employee where em_class<>'离职' and nvl(em_islandray,0)=-1 order by em_id");
+        SqlRowList persons = baseDao.queryForRowSet("select row_number() over (order by em_id) rn,em_id,em_code,em_name,em_password,em_mobile, em_email,em_cardcode,em_departmentcode,em_depart,em_position,em_defaulthsid from employee where em_class<>'离职' and nvl(em_islandray,0)=-1 order by em_id");
         while (persons.next()) {
             JSONObject personObj = new JSONObject();
             // ERP标识
@@ -103,6 +101,8 @@ public class SysNotifyTodoWebServiceImpl implements SysNotifyTodoWebService {
             }else if (result.getReturnState()==2){
                 String message = result.getMessage();
                 List<String> sqls = new ArrayList<>();
+                baseDao.execute("delete from jprocess where nvl(jp_landrayid,' ')<>' ' and jp_status='待审批' and " +
+                        "jp_nodedealman='"+cond+"'");
                 if (message.indexOf("errorPage")==-1) {
                     JSONObject jsonObject = JSONObject.fromObject(message);
                     JSONArray docs = jsonObject.getJSONArray("docs");
@@ -110,23 +110,22 @@ public class SysNotifyTodoWebServiceImpl implements SysNotifyTodoWebService {
                         Object obj = docs.get(i);
                         JSONObject object = JSONObject.fromObject(obj);
                         String link = object.get("link") == null ? null : object.getString("link").replace("&", "'||chr(38)||'");
-                        if (baseDao.getCountByCondition("jprocess", "jp_landrayid='" + object.getString("id") + "'") == 0) {
-                            sqls.add("insert into jprocess(jp_id, jp_name, jp_launcherid, jp_launchername, jp_form, " +
-                                    "jp_launchtime, jp_table, jp_status, jp_url,jp_landrayid,jp_nodedealman,jp_codevalue," +
-                                    "jp_processinstanceid,jp_nodename)" +
-                                    " values(process_seq.nextval,'" + object.getString("subject") + "','" + object.getString("creator") + "','" +
-                                    object.getString("creatorName") + "','" + object.getString("key") + "',to_date('" + object.getString("createTime") + "','yyyy-MM-dd HH24:mi:ss'),'" +
-                                    object.getString("modelName") + "','待审批','http://oa.seg.com.cn:8081" + link + "','" + object.getString("id") + "','" + cond + "','" + object.getString("moduleName") + "','" + object.getString("id") + "','" + cond + "')");
-                        }
+                        sqls.add("insert into jprocess(jp_id, jp_name, jp_launcherid, jp_launchername, jp_form, " +
+                                "jp_launchtime, jp_table, jp_status, jp_url,jp_landrayid,jp_nodedealman,jp_codevalue," +
+                                "jp_processinstanceid,jp_nodename) values(process_seq.nextval,'" + object.getString("subject") + "','" + object.getString("creator") + "','" +
+                                object.getString("creatorName") + "','" + object.getString("key") + "',to_date('" + object.getString("createTime") + "','yyyy-MM-dd HH24:mi:ss'),'" +
+                                object.getString("modelName") + "','待审批','http://oa.seg.com.cn:8081" + link + "','" + object.getString("id") + "','" + cond + "','" + object.getString("moduleName") + "','" + object.getString("id") + "','" + cond + "')");
+
 
-                    }
-                }else {
-                    SqlRowList rowSet = baseDao.queryForRowSet("select jp_processinstanceid from jprocess where nvl(jp_landrayid,' ')<>' ' and jp_status='待审批' and jp_nodedealman='" + cond + "'");
-                    while (rowSet.next()) {
-                       sqls.add("update jprocess set jp_status='已审批' where nvl(jp_landrayid,' ')<>' ' and jp_nodedealman='" + cond + "' and jp_processinstanceid='"+rowSet.getString("jp_processinstanceid")+"'");
-                        baseDao.execute("insert into jnode (jn_id,jn_name, jn_dealmanid,jn_processinstanceid,JN_DEALTIME, JN_DEALRESULT) values (jnode_seq.nextval,'" + cond + "','" + cond + "','" + rowSet.getString("jp_processinstanceid") + "',to_char(sysdate,'yyyy-MM-dd HH24:mi:ss'),'详见蓝凌OA')");
                     }
                 }
+                //else {
+//                    SqlRowList rowSet = baseDao.queryForRowSet("select jp_processinstanceid from jprocess where nvl(jp_landrayid,' ')<>' ' and jp_status='待审批' and jp_nodedealman='" + cond + "'");
+//                    while (rowSet.next()) {
+//                       sqls.add("update jprocess set jp_status='已审批' where nvl(jp_landrayid,' ')<>' ' and jp_nodedealman='" + cond + "' and jp_processinstanceid='"+rowSet.getString("jp_processinstanceid")+"'");
+//                        baseDao.execute("insert into jnode (jn_id,jn_name, jn_dealmanid,jn_processinstanceid,JN_DEALTIME, JN_DEALRESULT) values (jnode_seq.nextval,'" + cond + "','" + cond + "','" + rowSet.getString("jp_processinstanceid") + "',to_char(sysdate,'yyyy-MM-dd HH24:mi:ss'),'详见蓝凌OA')");
+//                    }
+//                }
                 if (sqls != null && sqls.size() > 0) {
                     baseDao.execute(sqls);
                 }