|
|
@@ -123,14 +123,11 @@ public class UserInfoCollectionController extends AppBaseController {
|
|
|
@GetMapping("/schedule/list")
|
|
|
public TableDataInfo list(FsUserInformationCollectionSchedule fsUserInformationCollectionSchedule)
|
|
|
{
|
|
|
- FsUser user=userService.selectFsUserByUserId(Long.parseLong(getUserId()));
|
|
|
- if (user!=null&&user.getCompanyUserId()!=null){
|
|
|
- fsUserInformationCollectionSchedule.setCompanyUserId(user.getCompanyUserId());
|
|
|
- log.info("当前登录userId:{}",getUserId());
|
|
|
- log.info("getUserId()获取的销售id:{}",user.getCompanyUserId());
|
|
|
- log.info("getCompanyUserId()获取的销售id:{}",getCompanyUserId());
|
|
|
+ Long companyUserId=getCompanyUserId();
|
|
|
+ if (companyUserId!=null){
|
|
|
+ fsUserInformationCollectionSchedule.setCompanyUserId(companyUserId);
|
|
|
//管理员查看所有数据
|
|
|
- Long isAdmin = roleMapper.companyUserIsAdmin(fsUserInformationCollectionSchedule.getCompanyUserId());
|
|
|
+ Long isAdmin = roleMapper.companyUserIsAdmin(getCompanyUserId());
|
|
|
if (isAdmin != null) {
|
|
|
fsUserInformationCollectionSchedule.setCompanyUserId(null);
|
|
|
}
|