首页待办列表部门显示问题修改撤回

ibps-bpmnbase-root/modules/bpmn-model/src/main/java/com/lc/ibps/bpmn/persistence/entity/BpmTaskPo.java

@@ -39,26 +39,6 @@ public class BpmTaskPo extends BpmTaskTbl implements IBpmTask, Cloneable {
 	@ApiModelProperty(value = "候选人范围")
 	protected String partyTypeName; /* 候选人范围 */
 
-	protected String from;
-
-	protected String bizKey;
-
-	public String getFrom() {
-		return from;
-	}
-
-	public void setFrom(String from) {
-		this.from = from;
-	}
-
-	public String getBizKey() {
-		return bizKey;
-	}
-
-	public void setBizKey(String bizKey) {
-		this.bizKey = bizKey;
-	}
-
 	public AuthorizeRightVo getAuthorizeRight() {
 		return authorizeRight;
 	}

ibps-bpmnbase-root/modules/bpmn-model/src/main/resources/com/lc/ibps/bpmn/persistence/mapping/BpmTask.map.xml

@@ -29,8 +29,6 @@
 		<result property="startDept" column="START_DEPT_" jdbcType="VARCHAR"/>
 		<result property="hotRead" column="HOT_READ_" jdbcType="VARCHAR"/>
 		<result property="waiJian" column="WAI_JIAN_" jdbcType="VARCHAR"/>
-		<result property="from" column="from_" jdbcType="VARCHAR"/>
-		<result property="bizKey" column="BIZ_KEY_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
@@ -183,7 +181,7 @@
 	
 	<!-- 待办事宜 未加入where -->
 	<select id="getByUser" parameterType="java.util.Map" resultMap="BpmTaskPo">
-		SELECT DISTINCT ds.wai_jian_,da.from_,st.BIZ_KEY_,<include refid="queryTaskColumns"/>
+		SELECT DISTINCT ds.wai_jian_,<include refid="queryTaskColumns"/>
 		FROM
 	    (
 		{{pageSqlStart}}	
@@ -311,8 +309,6 @@
 		FROM IBPS_BPM_TASK_CHANGE TC WHERE TC.STATUS_='running') T
 		ON T.TASKID = tmp.TASK_ID_
 		left join t_dsrw ds on tmp.PROC_INST_ID_=ds.PROC_INST_ID_
-		left join IBPS_BPM_INST st on tmp.BPMN_INST_ID_=st.BPMN_INST_ID_
-		left join ibps_data_dataset da on da.key_=st.form_key_
 	</select>
 	
 	<sql id="penddingColumns">

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmReceivedProvider.java

@@ -143,12 +143,17 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
 				bpmTaskRepository.buildInternal(list);
 				bpmTaskRepository.removeBuildInternal();
 			}
+			// 返回数据集合添加部门ID字段值
+			List<Map<String,Object>> deptList = (List<Map<String, Object>>) commonDao.query(" select id_,name_ from ibps_party_org where status_ = 'actived' ");
 			if (BeanUtils.isNotEmpty(list)){
 				for (BpmTaskPo bpmTaskPo : list) {
-					Map<String,Object> deptId = commonDao.queryOne("select bian_zhi_bu_men_ from "+bpmTaskPo.getFrom()+"  where id_ ='"+bpmTaskPo.getBizKey()+"'");
-					Map<String,Object> deptName = commonDao.queryOne("SELECT GROUP_CONCAT(name_ SEPARATOR ',') name_ from ibps_party_position where  FIND_IN_SET(id_,'"+deptId.get("bian_zhi_bu_men_")+"')");
-					bpmTaskPo.setStartDept(deptName.get("name_").toString());
-					bpmTaskPo.setStartDeptId(deptId.get("bian_zhi_bu_men_").toString());
+					for (Map<String, Object> deptMap : deptList) {
+						if (StringUtil.isNotEmpty(bpmTaskPo.getStartDept())){
+							if (bpmTaskPo.getStartDept().equals(deptMap.get("name_"))) {
+								bpmTaskPo.setStartDeptId(deptMap.get("id_").toString());
+							}
+						}
+					}
 				}
 			}
 			// 按照创建时间降序排序