From af319bec480d037d789fdee7475260852b47d944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Sun, 19 Aug 2018 15:54:52 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81.=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A0=BC=E5=BC=8F=20:heavy=5Fminus=5Fsign:=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BE=9D=E8=B5=96UPMS=20=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E4=BA=8B=E5=8A=A1=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-upms/pigx-upms-biz/pom.xml                      |  6 ------
 .../admin/controller/SysSocialDetailsController.java |  9 ++++-----
 .../src/main/resources/template/Controller.java.vm   | 12 +++++-------
 .../src/main/resources/template/index.vue.vm         |  2 +-
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index e0a46eceb..3916c99d9 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -102,12 +102,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
-		<!--分布式事务依赖-->
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-transaction</artifactId>
-			<version>${pigx.version}</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
index 06f3a5e5d..c25b3996f 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java
@@ -97,13 +97,12 @@ public class SysSocialDetailsController {
 	/**
 	 * 删除
 	 *
-	 * @param ids
+	 * @param id
 	 * @return R
 	 */
-	@DeleteMapping
-	public R delete(@RequestBody Integer[] ids) {
-		sysSocialDetailsService.deleteBatchIds(Arrays.asList(ids));
-		return new R<>(Boolean.TRUE);
+	@DeleteMapping("/{id}")
+	public R delete(@PathVariable Integer id ) {
+		return new R<>(sysSocialDetailsService.deleteById(id));
 	}
 
 	/**
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
index cdf8e78d3..48be1af48 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
@@ -56,8 +56,7 @@ public class ${className}Controller {
      */
     @PostMapping
     public R save(@RequestBody ${className} ${classname}){
-			${classname}Service.insert(${classname});
-			return new R<>(Boolean.TRUE);
+			return new R<>(${classname}Service.insert(${classname}));
     }
 
     /**
@@ -73,13 +72,12 @@ public class ${className}Controller {
 
     /**
      * 删除
-     * @param ${pk.lowerAttrName}s
+     * @param ${pk.lowerAttrName}
      * @return R
      */
-    @DeleteMapping
-    public R delete(@RequestBody ${pk.attrType}[] ${pk.lowerAttrName}s){
-			${classname}Service.deleteBatchIds(Arrays.asList(${pk.lowerAttrName}s));
-      return new R<>(Boolean.TRUE);
+    @DeleteMapping("/{${pk.lowerAttrName}}")
+    public R delete(@PathVariable ${pk.attrType} ${pk.lowerAttrName}){
+      return new R<>(${classname}Service.deleteById(${pk.lowerAttrName}));
     }
 
 }
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
index 9848914f0..2f2c07cba 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
@@ -126,7 +126,7 @@
         type: 'warning'
       })
         .then(function() {
-          return delObj(row.clientId)
+          return delObj(row.$pk.lowerAttrName)
         })
         .then(data => {
         _this.tableData.splice(index, 1)