TRX 1 rok temu
rodzic
commit
0a90603146

+ 4 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserSearch.java

@@ -85,4 +85,8 @@ public class OrganizationUserSearch extends SuperSearch {
     @Schema(description = "审核用户名称")
     private String reViewUserName;
 
+    private Long startReViewTime;
+
+    private Long endReViewTime;
+
 }

+ 10 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -9,6 +9,7 @@ import com.zhongshu.card.server.core.dao.org.extend.OrganizationUserDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.Role;
+import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,6 +155,15 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
             criteria.and("reviewUserId").is(param.getReViewUserId());
         }
 
+        // 审核时间
+        if (!CommonUtil.longIsEmpty(param.getStartReViewTime()) && !CommonUtil.longIsEmpty(param.getEndReViewTime())) {
+            criteria.and("reViewTime").gte(param.getStartReViewTime()).lte(param.getEndReViewTime());
+        } else if (!CommonUtil.longIsEmpty(param.getStartReViewTime()) && CommonUtil.longIsEmpty(param.getEndReViewTime())) {
+            criteria.and("reViewTime").gte(param.getStartReViewTime());
+        } else if (CommonUtil.longIsEmpty(param.getStartReViewTime()) && !CommonUtil.longIsEmpty(param.getEndReViewTime())) {
+            criteria.and("reViewTime").lte(param.getEndReViewTime());
+        }
+
         // 模糊搜索
         List<Criteria> criterias = new ArrayList<>();
         // 用户名称