From ca2a030894be529e954c3930f3bbeca7a12c5fd1 Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Tue, 7 Jun 2016 14:26:11 +0800
Subject: [PATCH]           bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

         用户名和手机号不能同事为空
---
 platform-biz-service/src/main/resources/mainOrm/Users.xml            | 4 ++--
 .../com/lyms/platform/operate/web/controller/UsersController.java    | 5 +++++
 2 files changed, 7 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 17633a4..d21a88d 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -57,13 +57,13 @@ values (#{foreignId},#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{accou
             <if test="foreignId != null and foreignId != ''">
                 foreign_id = #{foreignId,jdbcType=VARCHAR},
             </if>
-            <if test="account != null and account != ''">
+            <if test="account != null">
                 account = #{account,jdbcType=VARCHAR},
             </if>
             <if test="pwd != null and pwd != ''">
                 pwd = #{pwd,jdbcType=VARCHAR},
             </if>
-            <if test="phone != null and phone != ''">
+            <if test="phone != null ">
                 phone = #{phone,jdbcType=VARCHAR},
             </if>
             <if test="publishId != null and publishId >= 0">
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 cec71f6..4271a69 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
@@ -778,6 +778,11 @@ public class UsersController extends BaseController {
                             @RequestParam(value = "orgId",required = false) Integer orgId,
                             @RequestParam(value = "deptId",required = false) Integer deptId) {
 
+        if(StringUtils.isBlank(phone) && StringUtils.isBlank(account)) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "帐号和手机号不能同时为空");
+            return;
+        }
+
         if(null == roleIds) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "roleIds不能为空");
             return;
-- 
1.8.3.1