|
@@ -1,12 +1,11 @@
|
|
package com.ruoyi.system.service.impl;
|
|
package com.ruoyi.system.service.impl;
|
|
|
|
|
|
-import java.util.Calendar;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
+import com.ruoyi.framework.web.service.PermissionService;
|
|
import com.ruoyi.system.domain.TblTaskLog;
|
|
import com.ruoyi.system.domain.TblTaskLog;
|
|
import com.ruoyi.system.mapper.TblTaskLogMapper;
|
|
import com.ruoyi.system.mapper.TblTaskLogMapper;
|
|
import com.ruoyi.system.service.ITblTaskLogService;
|
|
import com.ruoyi.system.service.ITblTaskLogService;
|
|
@@ -31,6 +30,10 @@ public class TblTaskServiceImpl implements ITblTaskService
|
|
@Autowired
|
|
@Autowired
|
|
private ITblTaskLogService tblTaskLogService;
|
|
private ITblTaskLogService tblTaskLogService;
|
|
|
|
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private PermissionService permissionService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询工单任务
|
|
* 查询工单任务
|
|
*
|
|
*
|
|
@@ -59,6 +62,12 @@ public class TblTaskServiceImpl implements ITblTaskService
|
|
@Override
|
|
@Override
|
|
public List<TblTask> selectTblTaskList(TblTask tblTask)
|
|
public List<TblTask> selectTblTaskList(TblTask tblTask)
|
|
{
|
|
{
|
|
|
|
+ if(permissionService.hasAnyRoles("common")){
|
|
|
|
+ Map p = tblTask.getParams();
|
|
|
|
+ if(p==null) p = new HashMap<String,Object>();
|
|
|
|
+ p.put("userId",SecurityUtils.getLoginUser().getUserId()+"");
|
|
|
|
+ tblTask.setParams(p);
|
|
|
|
+ }
|
|
List<TblTask> taskList = tblTaskMapper.selectTblTaskList(tblTask);
|
|
List<TblTask> taskList = tblTaskMapper.selectTblTaskList(tblTask);
|
|
for (TblTask t:taskList
|
|
for (TblTask t:taskList
|
|
) {
|
|
) {
|