Merge remote-tracking branch 'origin/master'

src/main/java/com/jingcheng/cms/service/impl/CategoryServiceImpl.java

@@ -50,8 +50,10 @@ public class CategoryServiceImpl implements CategoryService {
         criteria.andEqualTo("state",Constants.STATE_VALID);
         Integer pageNum = jsonObject.getInteger("pageNum") == null ? 1 : jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize") == null ? 5 : jsonObject.getInteger("pageSize");
-        Integer level = jsonObject.getInteger("level") == null ? 1 : jsonObject.getInteger("level");
+        if (jsonObject.getInteger("level") != null) {
-        criteria.andEqualTo("level",level);
+            Integer level = jsonObject.getInteger("level");
+            criteria.andEqualTo("level",level);
+        }
         List<Category> CategoryList = categoryMapper.selectByExample(example);
         JSONObject pageJson = PageUtils.page(CategoryList,pageNum,pageSize);
         return pageJson;