product/product-server-administration/V2.0.0.git

			@@ -88,7 +88,7 @@
			StringBuilder stringBuilder = new StringBuilder();
			stringBuilder.append(" select ifnull(concat(tricode,'-',receiver) ,receiver) code,uuid,title,cooperate_uuid,grade,receiver as id,receiver,sender, ");
			stringBuilder.append(" receiver_name,(select user_name FROM product_sys_users where user_id=receiver) label,sender_name,status, ");
			stringBuilder.append(" tricode,opinion,handle_time,type,attachments from product_oa_cooperate_flow_node where cooperate_uuid=? ORDER BY tricode ");
			stringBuilder.append(" tricode,opinion,handle_time,type,attachments,is_hide_commentss from product_oa_cooperate_flow_node where cooperate_uuid=? ORDER BY tricode ");
			DataTableEntity dt = baseDao.listTable(stringBuilder.toString(), new Object[]{fs.getString("uuid")});
			JSONArray json = null;
			if (dt != null && dt.getRows() > 0) {
			@@ -318,10 +318,10 @@
			str.append("SELECT * FROM ( ");
			str.append(" select lc.*,lcn.uuid flow_node_uuid from product_oa_cooperate_flow_node as lcn LEFT JOIN product_oa_cooperates as lc ");
			str.append(" on lc.uuid=lcn.cooperate_uuid where lcn.receiver=? and lcn.status=? and sender_name is not null ");
			str.append(" ) a");
			if (!StringUtils.isEmpty(queryFilter)) {
			str.append(" where ").append(queryFilter);
			str.append(" and ").append(queryFilter);
			}
			str.append(" ) a");
			DataTableEntity dt = baseDao.listTable(str.toString(), new Object[]{user_id, 2}, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
			dt.getMeta().addAliasTable("product_oa_cooperates", "lc");
			dt.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");