|
@@ -192,7 +192,8 @@ public class PerformanceController {
|
|
|
HttpServletRequest req) {
|
|
|
Result<IPage<Performance>> result = new Result<IPage<Performance>>();
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
|
|
|
+ //String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
|
|
|
+ String departId = userEfficientVideoMapMapper.getDepartIdByUserId(sysUser.getId());
|
|
|
List<String> userIdList = userEfficientVideoMapMapper.getUserIdListByDepId(departId);
|
|
|
////
|
|
|
QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
|
|
@@ -231,7 +232,7 @@ public class PerformanceController {
|
|
|
Result<IPage<Performance>> result = new Result<IPage<Performance>>();
|
|
|
QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- sysUser.setId("b0e4798234df4096936e6bc6d00db3ba");
|
|
|
+ //sysUser.setId("b0e4798234df4096936e6bc6d00db3ba");
|
|
|
queryWrapper.eq("user_id", sysUser.getId());
|
|
|
Page<Performance> page = new Page<Performance>(pageNo, pageSize);
|
|
|
IPage<Performance> pageList = performanceService.page(page, queryWrapper);
|