Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-enterprise-base into developer

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

@@ -27,7 +27,7 @@ public class ResultControllerUtils {
         if (response.isSuccess()) {
             return RestResponse.success(response.getResult());
         } else {
-            throw new CommonException(response);
+            return RestResponse.failure(response.getCode(), response.getMessage());
         }
     }
 
@@ -96,7 +96,7 @@ public class ResultControllerUtils {
             page.setResult(EntityUtil.changeEntityListNew(clazz, page.getResult()));
             return RestResponse.success(page);
         } else {
-            throw new CommonException(response);
+            return RestResponse.failure(response.getCode(), response.getMessage());
         }
     }
 
@@ -113,7 +113,7 @@ public class ResultControllerUtils {
         if (response.isSuccess()) {
             return RestResponse.success(EntityUtil.changeEntityListNew(clazz, (List<?>) response.getResult()));
         } else {
-            throw new CommonException(response);
+            return RestResponse.failure(response.getCode(), response.getMessage());
         }
     }
 }