Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1693修复

Browse Source
This commit is contained in:
gaoqr
2026-06-16 14:31:42 +08:00
parent af3aa8eed4
commit 446f6e8446
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java
+1 -1
View File
@@ -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))
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java
+2 -2
View File
@@ -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;
/**
* 账号数量
*/
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
+2 -3
View File
@@ -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());
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+2
View File
@@ -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();