|
|
@ -199,7 +199,7 @@ public class CommonService implements ICommonService {
|
|
|
|
userDTO.setUsername(recycler.getStaffsName());
|
|
|
|
userDTO.setUsername(recycler.getStaffsName());
|
|
|
|
userDTO.setCompanyId(recycler.getCompanyId());
|
|
|
|
userDTO.setCompanyId(recycler.getCompanyId());
|
|
|
|
userDTO.setStationId(recycler.getStationId());
|
|
|
|
userDTO.setStationId(recycler.getStationId());
|
|
|
|
userDTO.setToken(this.createToken(userDTO));
|
|
|
|
userDTO.setToken("");
|
|
|
|
return userDTO;
|
|
|
|
return userDTO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -209,7 +209,7 @@ public class CommonService implements ICommonService {
|
|
|
|
userDTO.setId(client.getId());
|
|
|
|
userDTO.setId(client.getId());
|
|
|
|
userDTO.setUserType(UserTypeEnum.CLIENT);
|
|
|
|
userDTO.setUserType(UserTypeEnum.CLIENT);
|
|
|
|
userDTO.setUsername(client.getNickName());
|
|
|
|
userDTO.setUsername(client.getNickName());
|
|
|
|
userDTO.setToken(this.createToken(userDTO));
|
|
|
|
userDTO.setToken("");
|
|
|
|
return userDTO;
|
|
|
|
return userDTO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|