From d540a37543751d7581efb02252704cb121f6088e Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Wed, 23 Jul 2025 13:09:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(sis):=20=E6=9B=B4=E6=96=B0=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=BB=84=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/sis/domain/SisAuthGroup.java  | 10 ++++------
 .../org/dromara/sis/domain/bo/SisAuthGroupBo.java  | 11 +++++------
 .../org/dromara/sis/domain/vo/SisAuthGroupVo.java  | 14 ++++++--------
 .../sis/service/impl/SisAuthGroupServiceImpl.java  |  4 ++--
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
index 36776cc..15a061a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
@@ -4,8 +4,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -35,14 +33,14 @@ public class SisAuthGroup extends TenantEntity {
     private String name;
 
     /**
-     * 开始时间
+     * 面向对象(1-单位、2-个人)
      */
-    private Date begTime;
+    private Long groupType;
 
     /**
-     * 结束时间
+     * 是否启用(0：禁用，1启用)
      */
-    private Date endTime;
+    private Boolean isEnable;
 
 
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
index 6d712ee..141d348 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
@@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 授权组业务对象 sis_auth_group
@@ -35,14 +33,15 @@ public class SisAuthGroupBo extends BaseEntity {
     private String name;
 
     /**
-     * 开始时间
+     * 面向对象(1-单位、2-个人)
      */
-    private Date begTime;
+    @NotNull(message = "面向对象(1-单位、2-个人)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long groupType;
 
     /**
-     * 结束时间
+     * 是否启用(0：禁用，1启用)
      */
-    private Date endTime;
+    private Boolean isEnable;
 
 
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
index cbef544..3f57f15 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
@@ -1,7 +1,5 @@
 package org.dromara.sis.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.sis.domain.SisAuthGroup;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -43,16 +41,16 @@ public class SisAuthGroupVo implements Serializable {
     private String name;
 
     /**
-     * 开始时间
+     * 面向对象(1-单位、2-个人)
      */
-    @ExcelProperty(value = "开始时间")
-    private Date begTime;
+    @ExcelProperty(value = "面向对象(1-单位、2-个人)")
+    private Long groupType;
 
     /**
-     * 结束时间
+     * 是否启用(0：禁用，1启用)
      */
-    @ExcelProperty(value = "结束时间")
-    private Date endTime;
+    @ExcelProperty(value = "是否启用(0：禁用，1启用)")
+    private Boolean isEnable;
 
 
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
index 70fbd70..5a65277 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
@@ -75,8 +75,8 @@ public class SisAuthGroupServiceImpl implements ISisAuthGroupService {
         LambdaQueryWrapper<SisAuthGroup> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(SisAuthGroup::getId);
         lqw.like(StringUtils.isNotBlank(bo.getName()), SisAuthGroup::getName, bo.getName());
-        lqw.eq(bo.getBegTime() != null, SisAuthGroup::getBegTime, bo.getBegTime());
-        lqw.eq(bo.getEndTime() != null, SisAuthGroup::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getGroupType() != null, SisAuthGroup::getGroupType, bo.getGroupType());
+        lqw.eq(bo.getIsEnable() != null, SisAuthGroup::getIsEnable, bo.getIsEnable());
         return lqw;
     }