From 446f6e84464b0102fc1a55b815cd70cbee00bc1c Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 16 Jun 2026 14:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1693=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cf/imes/module/system/convert/auth/AuthConvert.java  | 2 +-
 .../module/system/dal/dataobject/organ/OrganizationDO.java   | 4 ++--
 .../cf/imes/module/system/dal/mysql/organ/OrganMapper.java   | 5 ++---
 .../imes/module/system/service/organ/OrganServiceImpl.java   | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java
index ba8e7ecc2..c17d6eaa5 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java
@@ -50,7 +50,7 @@ public interface AuthConvert {
         return AuthPermissionInfoRespVO.builder()
                 .user(AuthPermissionInfoRespVO.UserVO.builder()
                         .id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).organId(user.getOrganId()).organName(organizationDO.getName())
-                        .expireTime(organizationDO.getExpireTime()).ip(ipQuerySuccess ? ipQueryDataRespDTO.getIp() : "")
+                        .expireTime(organizationDO.getExpireTime().toLocalDate()).ip(ipQuerySuccess ? ipQueryDataRespDTO.getIp() : "")
                         .region(region)
                         .build())
                 .roles(convertSet(roleList, RoleDO::getCode))
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java
index 866cab592..05cced908 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 组织 DO
@@ -92,7 +92,7 @@ public class OrganizationDO extends BaseDO {
     /**
      * 过期时间
      */
-    private LocalDate expireTime;
+    private LocalDateTime expireTime;
     /**
      * 账号数量
      */
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
index e70ab0d90..d842f492c 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
+import com.cf.imes.framework.common.util.date.LocalDateTimeUtils;
 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.module.executor.enums.OrderDeletedEnum;
@@ -16,9 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.List;
 
 /**
@@ -46,7 +45,7 @@ public interface OrganMapper extends BaseMapperX<OrganizationDO> {
                 .eqIfPresent(OrganizationDO::getProvince, reqVO.getProvince())
                 .eqIfPresent(OrganizationDO::getCity, reqVO.getCity())
                 .eqIfPresent(OrganizationDO::getCounty, reqVO.getCounty())
-                .betweenIfPresent(OrganizationDO::getExpireTime, reqVO.getExpireTime())
+                .betweenIfPresent(OrganizationDO::getExpireTime, LocalDateTimeUtils.generateTimeSection(reqVO.getExpireTime()))
                 .likeIfPresent(OrganizationDO::getRemark, reqVO.getRemark())
                 .and(CharSequenceUtil.isNotBlank(reqVO.getName()), wrapper ->{
                     wrapper.or(Boolean.TRUE).like(OrganizationDO::getName, reqVO.getName());
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
index e0b978f15..1344a7ea6 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
@@ -229,6 +229,8 @@ public class OrganServiceImpl implements OrganService {
         tenant.setPinyinInitial(PinYinUtils.convertFirstChar(tenant.getName()));
         //todo 未来还需要判断是否大客户，大客户有自己dataCode
         tenant.setDataSourceCode(useDataCode);
+        // 过期时间设置为那一日的23：59：59
+        tenant.setExpireTime(LocalDateTime.of(createReqVO.getExpireTime(), LocalTime.of(23, 59, 59)));
 
         organMapper.insert(tenant);
         Long organId = tenant.getId();