diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
index 74b992a..be4d20f 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
@@ -1,13 +1,11 @@
package com.zteits.urbanops.module.garden.dal.mysql.assigntasks;
-import java.util.*;
-
import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO;
import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.*;
/**
* 派单任务主表(记录派单任务基本信息) Mapper
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
index e0502ab..e0308cb 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -28,13 +28,12 @@
a.company_id,
a.dept_id,
a.finish_percent as finishPercent,
- c.role_name,
c.finish_time,
c.user_name
FROM
garden_maintain_plan_detail a,
garden_maintain_plan b,
- (SELECT plan_no, role_name , finish_time,user_id,user_name FROM garden_maintain_plan_commit ORDER BY id ASC LIMIT 1) c
+ (SELECT plan_no,finish_time,user_id,user_name FROM garden_maintain_plan_commit ORDER BY id ASC LIMIT 1) c
WHERE
a.batch_no = b.batch_no
AND a.plan_no = c.plan_no
@@ -68,9 +67,9 @@
and a.dept_id = #{req.deptId}
-
- AND c.role_name LIKE CONCAT(#{req.roleName},'%')
-
+
+
+
AND c.user_name LIKE CONCAT(#{req.userName},'%')
@@ -114,4 +113,4 @@
AND a.finish_state = 2
AND c.plan_no = #{req.planNo}
-
\ No newline at end of file
+