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());
 		}
 
@@ -412,20 +412,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
 	}
 
-    /**
+	/**
-     * @Description 通过userId列表查询未被禁用的用户信息
+	 * @return Result<List < CommonStaffInfoResultDTO>>
-     * @Param CommonUserIdListFormDTO :: getUserIdList
+	 * @Description 通过userId列表查询未被禁用的用户信息
-     * @return Result<List<CommonStaffInfoResultDTO>>
+	 * @Param CommonUserIdListFormDTO :: getUserIdList
-     * @Author wangc
+	 * @Author wangc
-     * @Date 2020.04.24 15:44
+	 * @Date 2020.04.24 15:44
-     **/
+	 **/
-    @Override
+	@Override
-    public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
+	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()));
-    }
+	}
 
 }