From 77c36f521efa2e8f1af6ba2694ad96f58fa5aabe Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 6 May 2016 15:30:23 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform-biz-service/src/main/resources/mainOrm/Users.xml | 2 ++ .../com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml index b8d5b9f..7fdf78b 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Users.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml @@ -222,6 +222,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p and u.yn = #{yn,jdbcType=INTEGER} + and ur.yn = #{yn,jdbcType=INTEGER} and u.type = #{type,jdbcType=INTEGER} @@ -255,6 +256,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p and u.yn = #{yn,jdbcType=INTEGER} + and ur.yn = #{yn,jdbcType=INTEGER} and u.type = #{type,jdbcType=INTEGER} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java index c3562bf..fa67625 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java @@ -13,8 +13,6 @@ public class BasicConfigUpdateRequest { @NotEmpty(message = "name不能为空.") private String name; - @FormParam - @NotEmpty(message = "code不能为空.") private String code; @FormParam private int enable; -- 1.8.3.1