``

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblTaskController.java

@@ -1,42 +1,31 @@
 package com.ruoyi.web.controller.system;
 
-import java.security.Security;
-import java.util.*;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.JSUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.file.ImageUtils;
 import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.quartz.task.RyTask;
+import com.ruoyi.system.domain.TblTask;
 import com.ruoyi.system.domain.TblTaskLog;
 import com.ruoyi.system.service.*;
-import org.apache.commons.jexl3.JxltEngine;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.TblTask;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 /**
  * 工单任务Controller

ruoyi-system/src/main/resources/mapper/system/TblTaskMapper.xml

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <![CDATA[
                 and ( task_reporter = #{params.userId}
                 OR (task_id in (select c.task_id from  (SELECT * FROM tbl_task_log where id in (SELECT MAX(id) AS id  FROM tbl_task_log where  task_status=-1  GROUP BY task_id )) c where c.log_des->'$.zyfzr'= CAST(#{params.userId} AS SIGNED)))
-                OR (task_id IN (SELECT c.task_id FROM (SELECT * FROM tbl_task_log where id in (SELECT MAX(id) AS id  FROM tbl_task_log where  task_status=2  GROUP BY task_id )) c WHERE json_contains(c.log_des-> '$.fzr',#{params.userId}))))
+                OR (task_id IN (SELECT c.task_id FROM (SELECT * FROM tbl_task_log where id in (SELECT MAX(id) AS id  FROM tbl_task_log where  task_status=2  GROUP BY task_id )) c WHERE json_contains(c.log_des-> '$.fzr',concat('"',#{params.userId},'"')))))
                 ]]>
             </if>
         </where>