|
@@ -2,6 +2,7 @@ package com.hz.employmentsite.services.impl.taskAndLog;
|
|
|
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
+import com.hz.employmentsite.AppConfig;
|
|
|
import com.hz.employmentsite.mapper.PcDoworkMapper;
|
|
|
import com.hz.employmentsite.mapper.PcSiteUserMapper;
|
|
|
import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
|
|
@@ -45,6 +46,9 @@ public class DoWorkImpl implements DoWorkService {
|
|
|
@Autowired
|
|
|
private UserService userService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private AppConfig appConfig;
|
|
|
+
|
|
|
@Override
|
|
|
public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList,
|
|
|
String userName, String workStartDate, String workEndDate,
|
|
@@ -54,8 +58,7 @@ public class DoWorkImpl implements DoWorkService {
|
|
|
if (!stringUtils.IsNullOrEmpty(userId)) {
|
|
|
List<RoleModel> userRole = roleService.getRoleByUserID(userId);
|
|
|
if (!userRole.isEmpty()) {
|
|
|
- // RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals("f5a36ac2-2aec-4f3e-9d80-cfcb26d44fac")).findFirst().orElse(null); // 本地 站长ID
|
|
|
- RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals("d989844d-45d7-4b79-8262-7567a93de0af")).findFirst().orElse(null); // 正式平台 站长ID
|
|
|
+ RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals(appConfig.zzRoleID)).findFirst().orElse(null);
|
|
|
if (sysRole != null) {
|
|
|
// 查询用户所属的驿站
|
|
|
UserInfoModel userInfo = userService.getUserInfo(userId);
|