shiqian пре 4 година
родитељ
комит
f4df76e017

+ 2 - 2
boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java

@@ -81,11 +81,11 @@ public class DataScopeAspect
      */
     @AfterReturning(returning = "rvt", pointcut = "@annotation(com.boman.common.datascope.annotation.DataScope)")
     public Object AfterExec(JoinPoint joinPoint, Object rvt) {
-        System.out.println("AfterReturning增强:获取目标方法的返回值:" + rvt);
+//        System.out.println("AfterReturning增强:获取目标方法的返回值:" + rvt);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         String name = method.getName();
-        System.out.println("AfterReturning增强:获取目标方法的方法:" + name);
+//        System.out.println("AfterReturning增强:获取目标方法的方法:" + name);
         return rvt;
     }
 

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/ImportExportExcelController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author shiqian
  * @date 2021年06月08日 09:31
  **/
-@RequestMapping("web-core/file/common")
+@RequestMapping("/file/common")
 @RestController
 public class ImportExportExcelController {
 

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -261,7 +261,7 @@ public class TableServiceCmdService {
         rows.put(FormDataConstant.PAGE_TOTAL, total);
         rows.put(TABLE_HEAD_LIST, getTableHeadList(genTable));
         if (total <= 0) {
-            rows.put(FormDataConstant.PAGE_ROWS, null);
+            rows.put(FormDataConstant.PAGE_ROWS, Collections.EMPTY_LIST);
             return AjaxResult.success(rows);
         }