web-工作任务[驿站站长]数据范围调整

src/main/java/com/hz/employmentsite/util/datarange/DataRangeInterceptor.java

@@ -82,6 +82,9 @@ public class DataRangeInterceptor implements Interceptor {
                 whereClause = getJoinSql(entityClass, dataRange);
 
                 if (!whereClause.equals("")) {
+                    if(mainSql.contains("task.dotaskID,task.siteID")&&dataRange.getRange()==4){
+                        whereClause += " or x.siteID is null ";
+                    }
                     mainSql = "select x.* from" +
                             "(" + mainSql + ") x " +
                             whereClause;

src/main/resources/mapping/cquery/DoTaskCQuery.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DoTaskCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">
-        select task.dotaskID,task.workTypeID,task.siteID,task.content,task.dotaskName,task.CreateUserID as createUserID, u.`Name` as
+        select task.dotaskID,task.siteID,task.workTypeID,task.content,task.dotaskName,task.CreateUserID as createUserID, u.`Name` as
         createName,task.finishTime,task.createTime,task.modifyTime,
         task.taskStatus,dic_taskStatus.Name as taskStatusName,
         (select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID group by task.DotaskID)as userCount,