Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

4 years ago · 0a3263a3cc
1 changed files with 1 additions and 1 deletions
--- 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
@ -608,7 +608,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				return;
 			}
 			StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO();
-			resultDTO.setStaffId(staffInfo.getStaffId());
+			resultDTO.setStaffId(staffId);
 			resultDTO.setStaffName(staffInfo.getRealName());
 			resultDTO.setHeadPhoto(staffInfo.getHeadPhoto());
 			resultDTO.setGender(staffInfo.getGender());