111

src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@@ -139,7 +139,7 @@ public class AlarmDataServlet extends HttpServlet {
									}
									tmpObj = map.get("alarm_time");
									if (tmpObj != null && tmpObj instanceof String) {
										item.setStime((String) tmpObj);
										item.setAtime((String) tmpObj);
										if (msg.getAlarmTime() == null) {
											String at = (String) tmpObj;
											at = at.substring(0, 14);

src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java

@@ -90,6 +90,6 @@ public interface UserDao {
	@SelectList
	@From(User.class)
	List<User> queryByBridgeId(Connection con,
			@SqlColumn(value = "ID IN (SELECT UID FROM USER_BRIDGE WHERE BRIDGE=?", handlerClass = StringHandler.class) String bridge, @Nullable Boolean active)
			@SqlColumn(value = "ID IN (SELECT UID FROM USER_BRIDGE WHERE BRIDGE=?)", handlerClass = StringHandler.class) String bridge, @Nullable Boolean active)
			throws SQLException;
}