Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git into dev

src/main/java/com/ekexiu/portal/ware/WareDao.java

@@ -1,5 +1,9 @@
package com.ekexiu.portal.ware;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
@@ -30,10 +34,6 @@ import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public abstract class WareDao {
@@ -141,6 +141,7 @@ public abstract class WareDao {
	@LimitSelect
	@OrderBy("ORDER BY MODIFY_TIME DESC")
	@Where("STATE='1'")
	public abstract List<Ware> queryByResource(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ID IN (SELECT ID FROM WARE_RES WHERE RESOURCE=?)" }) String id, int rows)
			throws SQLException;
@@ -156,10 +157,10 @@ public abstract class WareDao {
	@Where("STATE='1'")
	@OrderBy(cols = { @LimitColumn(value = "sortFirst", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "modifyTime", asc = false),
			@LimitColumn(value = "id", asc = false) }, value = "")
	public abstract List<Ware> indexSearch(Connection con, @Nullable
	@GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?",
			"CATEGORY='1' AND OWNER IN(SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
			"CATEGORY ='2' AND OWNER IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)" }, additional = 1, isAnd = false, force = true) String key,
	public abstract List<Ware> indexSearch(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?",
					"CATEGORY='1' AND OWNER IN(SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"CATEGORY ='2' AND OWNER IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)" }, additional = 1, isAnd = false, force = true) String key,
			long sortFirst, String modifyTime, String id, int rows) throws SQLException;
	@Update

src/main/java/com/ekexiu/portal/ware/WareService.java

@@ -264,6 +264,7 @@ public class WareService {
	 */
	@Post
	@Path("/draft/org")
	public String draft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
@@ -366,6 +367,7 @@ public class WareService {
	 */
	@Post
	@Path("/publish/update")
	public boolean updatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
@@ -800,7 +802,6 @@ public class WareService {
		}
	}
	/**
	 * 后台管理系统中使用
	 */
@@ -843,10 +844,10 @@ public class WareService {
	@Post
	@Path("/publish/conUpdate")
	public boolean conUpdatePublish(@JdbcConn(true) Connection con,
								 @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
								 @Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		//ware.setCategory("1");
		// ware.setCategory("1");
		return conUpdate(con, ware, professor, resource);
	}
}