Procházet zdrojové kódy

Merge remote-tracking branch 'origin/matser' into matser

szjbdgzl před 1 rokem
rodič
revize
aad12abfa9

+ 2 - 2
ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/listener/ProcEndEventListener.java

@@ -188,9 +188,9 @@ public class ProcEndEventListener implements ApplicationListener<ProcEndEvent>,O
 	 * @param instId
 	 */
 	private void updateFlowStatus(String instId){
-		Map<String, Object> hisMap = commonDao.queryOne("SELECT PROC_DEF_KEY_,BIZ_KEY_ FROM ibps_bpm_inst_his WHERE id_ = '" + instId + "' ");
+		Map<String, Object> hisMap = commonDao.queryOne("SELECT PROC_DEF_KEY_,BIZ_KEY_,BPMN_DEF_ID_ FROM ibps_bpm_inst_his WHERE id_ = '" + instId + "' ");
 		if (BeanUtils.isNotEmpty(hisMap)){
-			Map<String, Object> defMap = commonDao.queryOne("select BO_CODE_ from ibps_bpm_def where DEF_KEY_ = '" + hisMap.get("PROC_DEF_KEY_") + "' ");
+			Map<String, Object> defMap = commonDao.queryOne("select BO_CODE_ from ibps_bpm_def where BPMN_DEF_ID_ = '" + hisMap.get("BPMN_DEF_ID_") + "' ");
 			if (BeanUtils.isNotEmpty(defMap)) {
 				commonDao.execute("update t_" + defMap.get("BO_CODE_") + " set shi_fou_guo_shen_ = '已完成' where id_ = '" + hisMap.get("BIZ_KEY_") + "' ");
 				LOGGER.warn("Update Status BIZ_KEY_=" + hisMap.get("BIZ_KEY_"));

+ 1 - 1
ibps-starter-parent/pom.xml

@@ -113,7 +113,7 @@
 
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <apache.log4j.version>2.11.0</apache.log4j.version>
+        <apache.log4j.version>2.16.0</apache.log4j.version>
 
         <commons-logging.version>1.1.1</commons-logging.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>