From e8b892dfed1afd907b7d257e42bbd15bb40db5c6 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 03 Apr 2020 15:32:29 +0800
Subject: [PATCH] 1.为所有的生成的*Mapper.xml文件中的findbyobject增加  limit 1代码 2.为所有的*Mapper.java文件中的 findbyobject方法的参数增加前缀 @Param("p") 3.调整了organization 以及userorg的实体引用(从common中的model中引用)

---
 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
index a0a5f7a..d40f2c4 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
@@ -83,11 +83,20 @@
     @ApiOperation(value = "保存")
     @PostMapping
     public ResultBody save(@Valid @RequestBody ${className} ${classname}, BindingResult bindingResult) {
+        List<String> errMsg= new ArrayList<>();
         if (bindingResult.hasErrors()) {
-            return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+            for (ObjectError error : bindingResult.getAllErrors()) {
+                errMsg.add(error.getDefaultMessage());
+            }
+            return ResultBody.failed().msg(errMsg.toString());
         } else {
-            ${classname}Service.saveOrUpdate(${classname});
-            return ResultBody.ok().data(${classname}).msg("保存成功");
+            boolean v= ${classname}Service.saveOrUpdate(${classname});
+            if(v) {
+                return ResultBody.ok().data(${classname}).msg("保存成功");
+            }
+            else {
+                return ResultBody.failed().msg("保存失败");
+            }
         }
     }
 
@@ -97,7 +106,12 @@
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
     public ResultBody delete(@PathVariable Long ${pk.attrname}) {
-        ${classname}Service.removeById(${pk.attrname});
-        return ResultBody.ok().msg("删除成功");
+        boolean v= ${classname}Service.removeById(${pk.attrname});
+        if(v) {
+            return ResultBody.ok().msg("删除成功");
+        }
+        else {
+            return ResultBody.failed().msg("删除失败");
+        }
     }
 }

--
Gitblit v1.8.0