From 69e3772ebe4e01800e7cfeacb0b00f73d39a3214 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Mon, 28 Mar 2016 16:36:12 +0800
Subject: [PATCH] platform permission  fix bug

---
 .../lyms/platform/operate/web/controller/DepartmentsController.java | 4 ++--
 .../platform/operate/web/controller/OrganizationController.java     | 4 ++--
 .../com/lyms/platform/operate/web/controller/RolesController.java   | 4 ++--
 .../com/lyms/platform/operate/web/controller/UsersController.java   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index 9ca9b1d..2620fe8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -115,8 +115,8 @@ public class DepartmentsController extends BaseController {
                                @RequestParam(value = "pid") Integer pid,
                                @RequestParam(value = "name") String name,
                                @RequestParam(value = "orgId") Integer orgId,
-                               @RequestParam(value = "description") String description,
-                               @RequestParam(value = "shortCode") String shortCode) {
+                               @RequestParam(value = "description", required = false) String description,
+                               @RequestParam(value = "shortCode", required = false) String shortCode) {
 
         Organization organization = organizationService.getOrganization(orgId);
 
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 032601e..b0a5febe 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
@@ -124,8 +124,8 @@ public class OrganizationController extends BaseController {
                                 @RequestParam(value = "cityId") Integer cityId,
                                 @RequestParam(value = "areaId") Integer areaId,
                                 @RequestParam(value = "address") String address,
-                                @RequestParam(value = "description") String description,
-                                @RequestParam(value = "shortCode") String shortCode) {
+                                @RequestParam(value = "description", required = false) String description,
+                                @RequestParam(value = "shortCode", required = false) String shortCode) {
 
         //获取登录用户
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index f843d4d..343b140 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -102,8 +102,8 @@ public class RolesController extends BaseController {
                          @RequestParam(value = "type")Integer type,
                          @RequestParam(value = "name")String name,
                          @RequestParam(value = "enable")Integer enable,
-                         @RequestParam(value = "remarks")String remarks,
-                         @RequestParam(value = "shortCode")String shortCode) {
+                         @RequestParam(value = "remarks", required = false)String remarks,
+                         @RequestParam(value = "shortCode", required = false)String shortCode) {
 
         //获取登录用户
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 338a0c5..63cbd84 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -247,11 +247,11 @@ public class UsersController extends BaseController {
                          @RequestParam(value = "type") Integer type,
                          @RequestParam(value = "deptId") Integer deptId,
                          @RequestParam(value = "orgId") Integer orgId,
-                         @RequestParam(value = "name") String name,
-                         @RequestParam(value = "account")String account,
+                         @RequestParam(value = "name", required = false) String name,
+                         @RequestParam(value = "account", required = false)String account,
                          @RequestParam(value = "phone") String phone,
                          @RequestParam(value = "enable") Integer enable,
-                         @RequestParam(value = "remarks") String remarks,
+                         @RequestParam(value = "remarks", required = false) String remarks,
                          @RequestParam(value = "roleIds") String roleIds) {
 
 
-- 
1.8.3.1