任务查询和巡检分组修改

huaxin-system/src/main/java/com/zehong/system/mapper/TTaskMapper.java

@@ -66,7 +66,7 @@ public interface TTaskMapper
      * @param param 参数
      * @return
      */
-    TTask selectCurrentTaskByType(Map<String,Object> param);
+    List<TTask> selectCurrentTaskByType(Map<String,Object> param);
 
     /**
      * tTask

huaxin-system/src/main/java/com/zehong/system/service/ITTaskService.java

@@ -66,7 +66,7 @@ public interface ITTaskService
      * @param param 参数
      * @return
      */
-    TTask selectCurrentTaskByType(Map<String,Object> param);
+    List<TTask> selectCurrentTaskByType(Map<String,Object> param);
 
     /**
      * 任务列表

huaxin-system/src/main/java/com/zehong/system/service/impl/TTaskServiceImpl.java

@@ -147,7 +147,7 @@ public class TTaskServiceImpl implements ITTaskService
      * @return
      */
     @Override
-    public TTask selectCurrentTaskByType(Map<String,Object> param){
+    public List<TTask> selectCurrentTaskByType(Map<String,Object> param){
         return tTaskMapper.selectCurrentTaskByType(param);
     }
 

huaxin-system/src/main/resources/mapper/system/TGroupMemberInfoMapper.xml

@@ -109,12 +109,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN t_group_member_info member ON member.user_id = su.user_id
         LEFT JOIN sys_dept dept ON dept.dept_id = su.dept_id
         <where>
-            <if test="groupId != null">
+            <!--<if test="groupId != null">
                 (member.group_id is null or member.group_id = #{groupId})
             </if>
             <if test="groupId == null">
                 member.group_id is null
-            </if>
+            </if>-->
             <if test="nickName != null and nickName != ''">
                 and su.nick_name = #{nickName}
             </if>

huaxin-system/src/main/resources/mapper/system/TTaskMapper.xml

@@ -167,7 +167,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY task.id
         ORDER BY create_time DESC
-        LIMIT 1
     </select>
     <select id="selecttasknums" parameterType="TTask" resultMap="TTaskResult">
         SELECT