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

         获取用户列表 nullpointer
---
 .../com/lyms/platform/operate/web/controller/UsersController.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 dd8c25c..2ab16f4 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
@@ -192,7 +192,9 @@ public class UsersController extends BaseController {
             user.setRoles(this.getUserRoles(user.getId()));
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
 
-            user.setPwd(user.getPwd().replaceAll(".","*"));
+            if(StringUtils.isNotBlank(user.getPwd())) {
+                user.setPwd(user.getPwd().replaceAll(".","*"));
+            }
         }
 
         FrontEndResult frontEndResult = new FrontEndResult();
-- 
1.8.3.1