Merge remote-tracking branch 'origin/dev_govorg' into dev

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -314,7 +314,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());
 		}
 
@@ -413,9 +413,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
 	/**
+	 * @return Result<List < CommonStaffInfoResultDTO>>
 	 * @Description 通过userId列表查询未被禁用的用户信息
 	 * @Param CommonUserIdListFormDTO :: getUserIdList
-     * @return Result<List<CommonStaffInfoResultDTO>>
 	 * @Author wangc
 	 * @Date 2020.04.24 15:44
 	 **/
@@ -425,7 +425,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 			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()));
 	}
 
 }