Merge branch 'zx_saas_1220' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/SysSuggestionTypeController.java

@@ -27,17 +27,10 @@ public class SysSuggestionTypeController extends BaseController {
 
     @ApiOperation(value = "查询所有")
     @PostMapping("queryAll")
-    public HttpResponseResult<Map<Integer,String>> queryAll() {
-        Map<Integer,String> result = new HashMap<>();
-        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+    public HttpResponseResult<List<SysSuggestionType>> queryAll() {
+        return succeed(sysSuggestionTypeService.lambdaQuery()
                 .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
-                .orderByDesc(SysSuggestionType::getId).list();
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.forEach(item -> {
-                result.put(item.getId(),item.getType());
-            });
-        }
-        return succeed(result);
+                .orderByDesc(SysSuggestionType::getId).list());
     }
 
 }

mec-application/src/main/java/com/ym/mec/teacher/controller/SysSuggestionTypeController.java

@@ -27,17 +27,10 @@ public class SysSuggestionTypeController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @PostMapping("queryAll")
-    public HttpResponseResult<Map<Integer,String>> queryAll() {
-        Map<Integer,String> result = new HashMap<>();
-        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+    public HttpResponseResult<List<SysSuggestionType>> queryAll() {
+        return succeed(sysSuggestionTypeService.lambdaQuery()
                 .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
-                .orderByDesc(SysSuggestionType::getId).list();
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.forEach(item -> {
-                result.put(item.getId(),item.getType());
-            });
-        }
-        return succeed(result);
+                .orderByDesc(SysSuggestionType::getId).list());
     }
 
 }

mec-application/src/main/java/com/ym/mec/web/controller/SysSuggestionTypeController.java

@@ -43,7 +43,7 @@ public class SysSuggestionTypeController extends BaseController {
     @ApiOperation(value = "新增")
     @RequestMapping("add")
     @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/add')")
-    public Object add(SysSuggestionType suggestionType) {
+    public Object add(@RequestBody SysSuggestionType suggestionType) {
         if(StringUtils.isEmpty(suggestionType.getType())){
             return failed("反馈类型不能为空");
         }

mec-application/src/main/java/com/ym/mec/web/controller/education/EduSysSuggestionController.java

@@ -61,17 +61,10 @@ public class EduSysSuggestionController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @PostMapping("queryAll")
-    public HttpResponseResult<Map<Integer,String>> queryAll() {
-        Map<Integer,String> result = new HashMap<>();
-        List<SysSuggestionType> list = sysSuggestionTypeService.lambdaQuery()
+    public HttpResponseResult<List<SysSuggestionType>> queryAll() {
+        return succeed(sysSuggestionTypeService.lambdaQuery()
                 .eq(SysSuggestionType::getTenantId, TenantContextHolder.getTenantId())
-                .orderByDesc(SysSuggestionType::getId).list();
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.forEach(item -> {
-                result.put(item.getId(),item.getType());
-            });
-        }
-        return succeed(result);
+                .orderByDesc(SysSuggestionType::getId).list());
     }
 
 }