Explorar o código

提交代码:取消分页

sunqing %!s(int64=4) %!d(string=hai) anos
pai
achega
b96161dab6

+ 2 - 0
src/main/java/com/minpay/db/table/own/mapper/CategoryManageMapper.java

@@ -14,4 +14,6 @@ public interface CategoryManageMapper extends IMINMybatisEntityMapper {
 
 	/**查询分类--添加/修改商品选择时用*/
 	List<Map<String, String>> queryCategoryForProduct(Map<String, String> map, MINRowBounds rows);
+
+    List<Map<String, Object>> queryCategoryList(Map<String, String> map);
 }

+ 2 - 0
src/main/java/com/minpay/db/table/own/mapper/ProductManageMapper.java

@@ -24,4 +24,6 @@ public interface ProductManageMapper extends IMINMybatisEntityMapper {
 	List<Map<String, String>> queryProduct(Map<String, String> map);
 	/**查看正常状态商品信息*/
 	List<Map<String, String>> queryProductz(Map<String, String> map, MINRowBounds rows);
+
+    List<Map<String, String>> queryProductz(Map<String, String> map);
 }

+ 1 - 5
src/main/java/com/minpay/shouhuo/productaction/CategoryManageAction.java

@@ -75,15 +75,12 @@ public class CategoryManageAction implements IMINAction {
 			@MINParam(key = "createUser")String createUser,
 			@MINParam(key = "categoryName")String categoryName,
 			@MINParam(key = "parentCode") String parentCode,
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "5") int limit,
 			MINSession session) throws MINBusinessException {
 		//创建返回值对象
 		MINActionResult res = new MINActionResult();
 		//获取操作员信息
 		User user = session.getUser();
 		//创建分页对象
-		MINRowBounds rows = new MINRowBounds(page, limit);
 		//初始化查询条件
 		Map<String,String> map = new HashMap<String,String>();
 		map.put("state", state);				//类目状态
@@ -94,14 +91,13 @@ public class CategoryManageAction implements IMINAction {
 		//执行查询
 		List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(CategoryManageMapper.class)
-						.queryCategoryList(map, rows);
+						.queryCategoryList(map);
 		//格式化时间和状态
 		list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
 		list = new MINCopyFormat("{state:'stateDesc'}").format(list);
 			list = Service.lookup(IFormatService.class).formatEnum(list,"{stateDesc:'CATEGORY_STATE'}");
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
 		return res;
 	}
 	

+ 1 - 8
src/main/java/com/minpay/shouhuo/productaction/ProductManageAction.java

@@ -330,8 +330,6 @@ public class ProductManageAction implements IMINAction {
 	 * @param model				商品型号
 	 * @param createUser		添加人
 	 * @param dates				添加时间
-	 * @param page
-	 * @param limit
 	 * @return
 	 * @throws MINBusinessException
 	 */
@@ -344,8 +342,6 @@ public class ProductManageAction implements IMINAction {
 			@MINParam(key = "brandName") String brandName,
 			@MINParam(key = "categoryId") String categoryId,
 			@MINParam(key = "createUser") String createUser,
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "3") int limit,
 			MINSession session) throws MINBusinessException {
 		
 		MINActionResult res = new MINActionResult();
@@ -367,19 +363,16 @@ public class ProductManageAction implements IMINAction {
 /*		if("10000002".equals(user.getRoleId())){
 			map.put("userId",user.getId());
 		}*/
-		//分页
-		MINRowBounds rows = new MINRowBounds(page, limit);
 		//执行查询
 		List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(ProductManageMapper.class)
-												.queryProductz(map, rows);
+												.queryProductz(map);
 		//格式化时间和状态
 		list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
 		list = new MINCopyFormat("{history:'historyDesc',state:'stateDesc',source:'sourceDesc'}").format(list);
 		list = Service.lookup(IFormatService.class).formatEnum(list,"{historyDesc:'PRODUCT_HISTORY',stateDesc:'PRODUCT_STATE',sourceDesc:'PRODUCT_SOURCE'}");
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT,rows.getMaxRows());
 		return res;
 	}