小程序流程加密、流程模板排序

src/main/bpm/com/yw/bpm/client/action/BpmClientFlowDetailAction.java

@@ -225,6 +225,9 @@ public class BpmClientFlowDetailAction extends RequestAbs {
 									}
 								}
 							}
+							if ("25".equals(fe.getType().getValue())) {
+								defaultValue = "******";
+							}
 							element.put("defaultValue", defaultValue);
 						} else {
 							element.put("defaultValue", "");

src/main/bpm/com/yw/bpm/flow/dao/FlowModelDaoImpl.java

@@ -296,7 +296,7 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 		if (conditions.get("canStart") != null && "1".equals(conditions.get("canStart"))) {
 			sql.append(" and (t.n_control = 1 or (t.n_control = 0 and t.n_control_url is not null and t.n_control_url != '')) "); 		
 		}
-		sql.append(" order by t.l_type_id desc, t.l_model_id desc");
+		sql.append(" order by t.v_model_name, t.l_type_id desc, t.l_model_id desc");
 		return SpringUtil.springQueryForList(jdbcTemplate, sql.toString(), args.toArray(), new FlowModelMapper());
 	}