From cfdf7d7696872a229cd3839a9641cb4c3869df2b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 28 Apr 2020 16:34:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87-=E5=B7=A5=E4=BD=9C=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerStaffServiceImpl.java        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 7357252d9b..73a6d24526 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -182,9 +182,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault());
 		List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
 		for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) {
-			if (govStaffRoleResultDTO.getRoleKey()==UserRoleConstant.GRID_MANAGER){
+			if (govStaffRoleResultDTO.getRoleKey() == UserRoleConstant.GRID_MANAGER) {
 				for (StaffGridListDTO staffGridListDTO : staffGridListDTOS) {
-					if (staffGridListDTO.getStaffId()==govStaffRoleResultDTO.getStaffId()){
+					if (staffGridListDTO.getStaffId() == govStaffRoleResultDTO.getStaffId()) {
 						staffGridListDTO.setRoleName(govStaffRoleResultDTO.getRoleName());
 					}
 					break;
@@ -316,7 +316,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
 		customerStaffFormDTO.setMobile(fromDTO.getMobile());
 		CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(customerStaffFormDTO);
-		if (!fromDTO.getStaffId().equals(customerStaffDTO.getUserId())) {
+		if (null != customerStaffDTO && !fromDTO.getStaffId().equals(customerStaffDTO.getUserId())){
 			return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
 		}
 
@@ -414,20 +414,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
 	}
 
-    /**
-     * @Description 通过userId列表查询未被禁用的用户信息
-     * @Param CommonUserIdListFormDTO :: getUserIdList
-     * @return Result<List<CommonStaffInfoResultDTO>>
-     * @Author wangc
-     * @Date 2020.04.24 15:44
-     **/
-    @Override
-    public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
+	/**
+	 * @return Result<List < CommonStaffInfoResultDTO>>
+	 * @Description 通过userId列表查询未被禁用的用户信息
+	 * @Param CommonUserIdListFormDTO :: getUserIdList
+	 * @Author wangc
+	 * @Date 2020.04.24 15:44
+	 **/
+	@Override
+	public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
 		if (userIdList.getUserIdList().size() <= NumConstant.ZERO) {
 			return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
 		}
 
-		return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId()));
-    }
+		return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(), userIdList.getCustomerId()));
+	}
 
 }
\ No newline at end of file