个人配置校验

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/TravelConfigController.java

@@ -41,6 +41,16 @@ public class TravelConfigController extends BaseController {
         return R.ok(list.get(0));
     }
 
+    /**
+     * 获取个人差旅设置详细信息
+     *
+     * @return 个人差旅设置详细信息
+     */
+    @GetMapping("/person")
+    public R<TravelConfigVo> getPersonInfo() {
+        return R.ok(travelConfigService.getTravelConfig());
+    }
+
     /**
      * 获取差旅设置详细信息
      *

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/TravelConfigPersonBo.java

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -17,6 +18,7 @@ import org.dromara.server.domain.TravelConfigPerson;
  * @date 2024-12-23
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = TravelConfigPerson.class, reverseConvertGenerate = false)
 public class TravelConfigPersonBo extends BaseEntity {

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/ITravelConfigService.java

@@ -29,4 +29,11 @@ public interface ITravelConfigService extends IBaseService<TravelConfigVo, Trave
      */
     boolean checkTravelLegal(TravelApply travelApply);
 
+    /**
+     * 获取差旅配置
+     *
+     * @return 差旅配置
+     */
+    TravelConfigVo getTravelConfig();
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TravelConfigPersonServiceImpl.java

@@ -14,6 +14,7 @@ import org.dromara.server.service.ITravelConfigPersonService;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * 员工差旅设置Service业务层处理
@@ -48,4 +49,10 @@ public class TravelConfigPersonServiceImpl extends AbstractBaseService<TravelCon
         return lqw;
     }
 
+    @Override
+    public void validEntityBeforeSave(TravelConfigPerson entity) {
+        TravelConfigPerson tcp = baseMapper.selectOne(buildQueryWrapper(new TravelConfigPersonBo().setUserId(entity.getUserId())));
+        Optional.ofNullable(tcp)
+            .ifPresent(t -> entity.setId(t.getId()));
+    }
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TravelConfigServiceImpl.java

 package org.dromara.server.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,17 +8,20 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.constant.travel.*;
 import org.dromara.server.domain.Apply;
 import org.dromara.server.domain.ApplyPerson;
 import org.dromara.server.domain.TravelConfig;
+import org.dromara.server.domain.TravelConfigPerson;
 import org.dromara.server.domain.bo.TravelConfigBo;
 import org.dromara.server.domain.vo.*;
 import org.dromara.server.mapper.ApplyMapper;
 import org.dromara.server.mapper.ApplyPersonMapper;
 import org.dromara.server.mapper.TravelConfigMapper;
+import org.dromara.server.mapper.TravelConfigPersonMapper;
 import org.dromara.server.service.ITravelConfigService;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +40,7 @@ public class TravelConfigServiceImpl extends AbstractBaseService<TravelConfigVo,
     private final TravelConfigMapper baseMapper;
     private final ApplyMapper applyMapper;
     private final ApplyPersonMapper applyPersonMapper;
+    private final TravelConfigPersonMapper travelConfigPersonMapper;
 
     @Override
     public BaseMapperPlus<TravelConfig, TravelConfigVo> mapper() {
@@ -80,8 +85,8 @@ public class TravelConfigServiceImpl extends AbstractBaseService<TravelConfigVo,
 
     @Override
     public boolean checkTravelLegal(TravelApply travelApply) {
-        TravelConfigVo tc = mapper().selectVoOne(new LambdaQueryWrapper<>());
-        Apply apply = Optional.ofNullable(travelApply.getApplyCode()).map(applyCode->{
+        TravelConfigVo tc = getTravelConfig();
+        Apply apply = Optional.ofNullable(travelApply.getApplyCode()).map(applyCode -> {
             return applyMapper.selectOne(new LambdaQueryWrapper<Apply>()
                 .eq(Apply::getApplyCode, applyCode));
         }).orElse(null);
@@ -141,4 +146,13 @@ public class TravelConfigServiceImpl extends AbstractBaseService<TravelConfigVo,
 
         return true;
     }
+
+    @Override
+    public TravelConfigVo getTravelConfig() {
+        //获取个人配置
+        TravelConfigPerson travelConfigPerson = travelConfigPersonMapper.selectOne(new LambdaQueryWrapper<TravelConfigPerson>()
+            .eq(TravelConfigPerson::getUserId, LoginHelper.getUserId()));
+        return Optional.ofNullable(travelConfigPerson)
+            .map(person -> BeanUtil.copyProperties(person, TravelConfigVo.class)).orElseGet(() -> mapper().selectVoOne(new LambdaQueryWrapper<>()));
+    }
 }