cuidi il y a 1 an
Parent
commit
74f6141b8d

+ 2 - 4
common/src/main/java/com/koobietech/eas/common/result/PageData.java

@@ -2,13 +2,11 @@ package com.koobietech.eas.common.result;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class PageData {
     private long total = 0;
-    private List data = null;
-    public static PageData init(List data, long total){
+    private Object data = null;
+    public static PageData init(Object data, long total){
         PageData ret = new PageData();
         ret.setData(data);
         ret.setTotal(total);

+ 2 - 2
controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java

@@ -18,9 +18,9 @@ public class EasDepartmentController {
 
 
     @GetMapping("/query")
-    public PageData query(@RequestParam Long id) {
+    public JsonResult query(@RequestParam Long id) {
         PageData ret = easDepartmentService.query(id);
-        return ret;
+        return JsonResult.data(ret);
     }
 
     @PostMapping("/add")

+ 5 - 0
service/pom.xml

@@ -32,6 +32,11 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <parent>

+ 1 - 1
service/src/main/java/com/koobietech/eas/service/impl/EasPermissionServiceImpl.java

@@ -42,7 +42,7 @@ public class EasPermissionServiceImpl implements EasPermissionService {
         criteria.andIdEqualTo(id);
 
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-        PageData ret = new PageData();
+        PageData ret = new PageData( );
         ret.setData(easSysPermissions);
         ret.setTotal(1);
         return ret;