From b3d1d1b34426c4454f5bba9acc6216ebcc0b8d1b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 8 Mar 2020 00:50:26 +0800 Subject: [PATCH] =?UTF-8?q?service=20=E6=96=B0=E5=A2=9E=20getAndValid(enti?= =?UTF-8?q?ty)=20=E6=9B=BF=E6=8D=A2=20get(pkClass,=20pkValue,=20isNewRecor?= =?UTF-8?q?d)=20=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=BA=E4=BA=86=E6=9B=B4?= =?UTF-8?q?=E5=A5=BD=E6=94=AF=E6=8C=81=E5=A4=8D=E5=90=88=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/sys/web/user/EmpUserController.java | 5 ++++- .../resources/templates/modules/gen/crud/controller.xml | 8 ++++++-- .../main/resources/templates/modules/gen/crud/entity.xml | 2 +- .../resources/templates/modules/gen/query/controller.xml | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index e8e6eecc..1e938920 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -73,7 +73,10 @@ public class EmpUserController extends BaseController { @ModelAttribute public EmpUser get(String userCode, boolean isNewRecord) { - return empUserService.get(userCode, isNewRecord); + EmpUser empUser = new EmpUser(); + empUser.setUserCode(userCode); + empUser.setIsNewRecord(isNewRecord); + return empUserService.getAndValid(empUser); } @RequiresPermissions("sys:empUser:view") diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index 46af085e..a3e18766 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -63,8 +63,12 @@ public class ${ClassName}Controller extends BaseController { <% if (table.pkList.~size == 1){ %> return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord); <% }else{ %> - return ${className}Service.get(new Class[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrType}.class<% } %>}, - new Object[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>}, isNewRecord); + ${ClassName} ${className} = new ${ClassName}(); + <% for(pk in table.pkList){ %> + ${className}.set${@StringUtils.cap(pk.simpleAttrName)}(${pk.simpleAttrName}); + <% } %> + ${className}.setIsNewRecord(isNewRecord); + return ${className}Service.getAndValid(${className}); <% } %> } diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml index 129b60e7..d2610b32 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml @@ -199,7 +199,7 @@ public class ${ClassName} extends ${table.isTreeEntity?'Tree':'Data'}Entity<${Cl %> public ${ClassName}() { - this(null); + this(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}null<% } %>); } <% diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml index c544a2c7..742c9be8 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml @@ -61,8 +61,12 @@ public class ${ClassName}Controller extends BaseController { <% if (table.pkList.~size == 1){ %> return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord); <% }else{ %> - return ${className}Service.get(new Class[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrType}.class<% } %>}, - new Object[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>}, isNewRecord); + ${ClassName} ${className} = new ${ClassName}(); + <% for(pk in table.pkList){ %> + ${className}.set${@StringUtils.cap(pk.simpleAttrName)}(${pk.simpleAttrName}); + <% } %> + ${className}.setIsNewRecord(isNewRecord); + return ${className}Service.getAndValid(${className}); <% } %> }