From 4766fe2b3c0c21f8fcf526a7f3532377c0a180be Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Sun, 1 May 2016 14:26:35 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../java/com/lyms/platform/permission/model/Organization.java | 8 -------- .../platform/operate/web/controller/OrganizationController.java | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 4140a3a..83115b3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -261,13 +261,5 @@ public class Organization { } - public String getShortcode() { - return shortCode; - } - - public void setShortcode(String shortCode) { - this.shortCode = shortCode; - - } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index ed90fe8..de72206 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -128,8 +128,8 @@ public class OrganizationController extends BaseController { organization.setStreetId(streetId); organization.setAddress(address); organization.setDescription(description); - organization.setShortcode(shortCode); organization.setModified(new Date()); + organization.setShortCode(shortCode); organizationService.updateOrganization(organization); ResultUtils.buildSuccessResultAndWrite(response); @@ -184,7 +184,7 @@ public class OrganizationController extends BaseController { organization.setStreetId(streetId); organization.setAddress(address); organization.setDescription(description); - organization.setShortcode(shortCode); + organization.setShortCode(shortCode); organization.setYn(YnEnums.YES.getId()); organization.setCreated(new Date()); organization.setModified(new Date()); -- 1.8.3.1