--DemandDao;DemandService;

src/main/java/com/ekexiu/portal/dao/DemandDao.java

@@ -48,13 +48,10 @@ public abstract class DemandDao {
	@From(Demand.class)
	public abstract int queryCountStatus(Connection con,String demandStatus)throws SQLException, JfwBaseException;
	
<<<<<<< HEAD
=======
	@SelectList
	@OrderBy("ORDER BY CREATE_TIME DESC")
	public abstract List<Demand> queryForOrg(Connection con,String orgId)throws SQLException;
	
>>>>>>> refs/remotes/origin/dev
	@SelectList
	@OrderBy("ORDER BY CREATE_TIME DESC")
	public abstract List<Demand> queryByDemander(Connection con,String demander)throws SQLException;

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

@@ -155,12 +155,6 @@ public class DemandService {
		return this.demandDao.queryForOrg(con, orgId);
	}
	
	@Get
	@Path("/queryPublish")
	public int queryPublish(@JdbcConn Connection con)throws SQLException, JfwBaseException{
		return this.demandDao.queryCountStatus(con, "1");
	}
	
	@Get
	@Path("/byDemander")
	public List<Demand> queryByDemander(@JdbcConn Connection con,String demander)throws SQLException{