Merge branch '2.2'

zhou-hao · zhou-hao · commit 184b88a1aa9f · 2016-12-22T10:36:55.000+08:00
# Conflicts:
#	hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java
@@ -63,11 +63,9 @@ public InsertMapper<Po> getInsertMapper() {
     public void tryValidPo(Po data) {
         Set<ConstraintViolation<Object>> set = validator.validate(data);
         ValidateResults results = new ValidateResults();
-        
-            for (ConstraintViolation<Object> violation : set) {
-                results.addResult(violation.getPropertyPath().toString(), violation.getMessage());
-            }
-        
+        for (ConstraintViolation<Object> violation : set) {
+            results.addResult(violation.getPropertyPath().toString(), violation.getMessage());
+        }
         if (!results.isSuccess())
             throw new ValidationException(results);
     }
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java
@@ -43,6 +43,6 @@ protected QueryPlanMapper getMapper() {
 
     @Override
     public int update(QueryPlan data) {
-        return createUpdate(data).includes(name, config, sharing).exec();
+        return createUpdate(data).includes(name, config, sharing).where(id, data.getId()).exec();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ protected QueryPlanMapper getMapper() {`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`public int update(QueryPlan data) {`
`46`		`- return createUpdate(data).includes(name, config, sharing).exec();`
	`46`	`+ return createUpdate(data).includes(name, config, sharing).where(id, data.getId()).exec();`
`47`	`47`	`}`
`48`	`48`	`}`