111

src/main/java/com/ekexiu/portal/platform/PlatformService.java

@@ -36,6 +36,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -208,9 +209,9 @@ public class PlatformService {
	@Path("/reqResetPw")
	@Post
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail, String url) throws SQLException, JfwBaseException {
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail,String id, String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
		if (pu == null)
		if (pu == null || !Objects.equals(pu.getId(), id))
			throw new JfwBaseException(-600001, "not found user");
		StateCode<String, String> sc = new StateCode<String, String>();
		sc.setCode(pu.getId());

src/main/java/com/ekexiu/portal/service/DemandService.java

@@ -395,12 +395,12 @@ public class DemandService {
	public PageQueryResult<Demand> query(@JdbcConn Connection con, @Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, boolean byCreateTime, @Nullable String key, @DefaultValue("1") int pageNo,
			@DefaultValue("5") int pageSize) throws SQLException {
		if(("2").equals(state)){
			return this.demandDao.pageQueryOrderByModifyTimeDesc(con, state, source, cost, duration, key, pageSize, pageNo);
			return this.demandDao.pageQueryOrderByModifyTimeDesc(con, state, source, cost, duration, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
		}
		if(byCreateTime){
			return this.demandDao.pageQueryOrderByCreateTimeDesc(con, state, source, cost, duration, key, pageSize, pageNo);
			return this.demandDao.pageQueryOrderByCreateTimeDesc(con, state, source, cost, duration, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
		}else{
			return this.demandDao.pageQueryOrderByInvalidDayAsc(con, state, source, cost, duration, key, pageSize, pageNo);
			return this.demandDao.pageQueryOrderByInvalidDayAsc(con, state, source, cost, duration, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
		}
	}
}