albertshaw před 8 roky
rodič
revize
794825e6cf

+ 1 - 1
src/main/java/com/goafanti/banners/controller/BannersApiController.java

@@ -62,7 +62,7 @@ public class BannersApiController extends BaseApiController {
 
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result portalBannersList(String key, String pageNo, String pageSize) {
-		Assert.isTrue(StringUtils.isNotBlank(key) && BannersType.containsType(key), "广告图位置标示不正确。");
+		Assert.isTrue(StringUtils.isBlank(key) || BannersType.containsType(key), "广告图位置标示不正确。");
 		Integer pN = getPageNo(pageNo);
 		Integer pS = getPageSize(pageSize);
 		return res().data(bannersService.findBannersList(key, (pN - 1) * pS, pS));

+ 5 - 2
src/main/java/com/goafanti/banners/service/BannersService.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class BannersService extends BaseMybatisDao<BannersMapper> {
 	public int updateBanner(Banners banners) {
 		return bannersMapper.updateByPrimaryKeySelective(banners);
 	}
-	
+
 	public int deleteBanner(Long id) {
 		return bannersMapper.deleteByPrimaryKey(id);
 	}
@@ -50,7 +51,9 @@ public class BannersService extends BaseMybatisDao<BannersMapper> {
 
 	private List<Banners> portalBanners(String sign, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		params.put("sign", sign);
+		if (StringUtils.isNotBlank(sign)) {
+			params.put("sign", sign);
+		}
 		params.put("pageSize", pageSize);
 		params.put("pageNo", pageNo);
 		return bannersMapper.findList(params);