判断空

gic-enterprise-base-api/src/main/java/com/gic/enterprise/utils/ResultControllerUtils.java

@@ -7,6 +7,8 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.exception.CommonException;
+import org.apache.commons.collections.CollectionUtils;
+
 /**
  * controller统一返回结果
  * @ClassName: ResultControllerUtils

@@ -94,6 +96,9 @@ public class ResultControllerUtils {
     public static RestResponse commonPageResult(ServiceResponse response, Class<?> clazz) {
         if (response.isSuccess()) {
             Page page = (Page) response.getResult();
+            if (page == null) {
+                return RestResponse.success();
+            }
             page.setResult(EntityUtil.changeEntityListNew(clazz, page.getResult()));
             return RestResponse.success(page);
         } else {