Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/BindApiServiceImpl.java

@@ -190,6 +190,7 @@ public class BindApiServiceImpl implements BindApiService {
 			//别人的clerkCOde换到自己上
 			StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
 			logger.info("3333333333333");
+			String sendClerkCode =  dto.getClerkCode();
 			dto.setClerkCode(fromClerkCode);
 			dto.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.updateById(dto);
@@ -220,14 +221,14 @@ public class BindApiServiceImpl implements BindApiService {
 				clerkService.updateClerk(clerkDTO);
 			}
 			//发送消息
-			if(StringUtil.isNotBlank(dto.getClerkCode())){
+			if(StringUtil.isNotBlank(sendClerkCode)){
 				//发送消息
 	            ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
 	            String clerkId = leader.getClerkId();
 				String storeName = departmentDTO.getDepartmentName();
 				String staffName = staffDTO.getStaffName();
 				String leaderName = leader.getClerkName();
-				String clerkCode = dto.getClerkCode();
+				String clerkCode = sendClerkCode;
 				String content = "【"+leaderName+"】:【"+storeName+"】"+staffName+"导购code:"+clerkCode+"已解绑，请重新分配会员！";
 				JSONObject jsonObject = new JSONObject();
 				jsonObject.put("storeId", storeId);