Merge branch 'gyj' into test
This commit is contained in:
commit
db371bf9fb
|
|
@ -155,9 +155,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
|
||||||
user.setJobs(jobs);
|
user.setJobs(jobs);
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
|
|
||||||
|
TbPlussShopStaffDto dto = tbPlussShopStaffMapper.toDto(tbPlussShopStaffRepository.save(resources));
|
||||||
|
|
||||||
shopStaffPermissionService.updateStaffPermission(user.getId().intValue(),
|
shopStaffPermissionService.updateStaffPermission(user.getId().intValue(),
|
||||||
Integer.valueOf(resources.getShopId()), resources.getId(), resources.getPermissions());
|
Integer.valueOf(resources.getShopId()), resources.getId(), resources.getPermissions());
|
||||||
return tbPlussShopStaffMapper.toDto(tbPlussShopStaffRepository.save(resources));
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue