Bladeren bron

feat: 工作任务设置本人权限

zhangying 10 maanden geleden
bovenliggende
commit
5bc7dc42b8

+ 1 - 1
src/main/java/com/hz/employmentsite/util/datarange/DataRangeInterceptor.java

@@ -130,7 +130,7 @@ public class DataRangeInterceptor implements Interceptor {
                         .findFirst().orElse(null);
                 break;
             case SELF:
-                field = Arrays.stream(entityClass.getDeclaredFields()).filter(x -> x.getAnnotationsByType(SiteID.class).length > 0)
+                field = Arrays.stream(entityClass.getDeclaredFields()).filter(x -> x.getAnnotationsByType(UserID.class).length > 0)
                         .findFirst().orElse(null);
                 break;
             default:

+ 5 - 3
src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -2,6 +2,7 @@ package com.hz.employmentsite.vo.taskAndLog;
 
 import com.hz.employmentsite.util.datarange.annotations.DoTaskID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.UserID;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import lombok.Data;
 
@@ -23,15 +24,16 @@ public class DoTaskVo {
     public Date finishTime;
 
     public Date createTime;
-
+    @UserID
+    public String createUserID;
     public String createName;
 
     public int userCount;
 
     public String workTypeName;
-    
+
     public String regionName;
-    
+
     public String streetName;
 
     @RegionID

+ 1 - 1
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.content,task.dotaskName,u.`Name` as
+        select task.dotaskID,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,