【U审批】【催办BUG】

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasJProcessService.java

@@ -19,17 +19,17 @@ public class UasJProcessService extends AbstractService {
         return queryForBean("select * from JProcess where jp_id=?", JProcess.class, id);
     }
     public JProcandOrProcess getJProcandOrProcessById(Integer id) {
-        return queryForBean("SELECT JP_TYEP, MAX(JP_ID) JP_ID, JP_NAME, JP_LAUNCHERID, JP_LAUNCHERNAME,  JP_CALLER, JP_TABLE, JP_KEYVALUE, JP_URL, JP_CODEVALUE, JP_NODEID  FROM ( " +
-                "select 'JPROCESS' jptype,jp_id,jp_name,jp_launcherid,jp_launchername,jp_caller,jp_table,jp_keyvalue,jp_url,jp_codevalue,jp_nodeid from JProcess " +
-                "union all " +
-                "select 'JPROCAND' jptype,jp_id,jp_name,jp_launcherid,jp_launchername,jp_caller,jp_table,jp_keyvalue,jp_url,jp_codevalue,jp_nodeid  from JProcand where jp_flag=1)" +
-                " where jp_nodeid=? GROUP BY JP_TYEP, JP_NAME, JP_LAUNCHERID, JP_LAUNCHERNAME,JP_CALLER, JP_TABLE, JP_KEYVALUE, JP_URL, JP_CODEVALUE, JP_NODEID", JProcandOrProcess.class, id);
+        return queryForBean("SELECT JPTYPE, MAX(JP_ID) JP_ID, JP_NAME, JP_LAUNCHERID, JP_LAUNCHERNAME,  JP_CALLER, JP_TABLE, JP_KEYVALUE, JP_URL, JP_CODEVALUE, JP_NODEID  FROM ( " +
+                "SELECT 'JPROCESS' JPTYPE,JP_ID,JP_NAME,JP_LAUNCHERID,JP_LAUNCHERNAME,JP_CALLER,JP_TABLE,JP_KEYVALUE,JP_URL,JP_CODEVALUE,JP_NODEID FROM JPROCESS " +
+                "UNION ALL " +
+                "SELECT 'JPROCAND' JPTYPE,JP_ID,JP_NAME,JP_LAUNCHERID,JP_LAUNCHERNAME,JP_CALLER,JP_TABLE,JP_KEYVALUE,JP_URL,JP_CODEVALUE,JP_NODEID  FROM JPROCAND WHERE JP_FLAG=1) " +
+                " WHERE JP_NODEID=? GROUP BY JPTYPE, JP_NAME, JP_LAUNCHERID, JP_LAUNCHERNAME,JP_CALLER, JP_TABLE, JP_KEYVALUE, JP_URL, JP_CODEVALUE, JP_NODEID", JProcandOrProcess.class, id);
     }
     public String[] getDealManById(Integer id) {
         try{
         List<String> emList =  queryForList("SELECT EM_QYWX FROM ( " +
-                "SELECT  JP_NODEDEALMAN FROM JPROCESS UNION ALL " +
-                "SELECT JP_CANDIDATE JP_NODEDEALMAN FROM JPROCAND WHERE JP_FLAG=1 " +
+                "SELECT JP_NODEDEALMAN,JP_NODEID FROM JPROCESS UNION ALL " +
+                "SELECT JP_CANDIDATE JP_NODEDEALMAN,JP_NODEID FROM JPROCAND WHERE JP_FLAG=1 " +
                 ") LEFT JOIN EMPLOYEE ON EM_CODE = JP_NODEDEALMAN " +
                 " where JP_NODEID=? AND EM_CLASS <> '离职' AND EM_QYWX IS NOT NULL GROUP BY EM_QYWX", String.class, id);
             return emList.toArray(new String[emList.size()]);