24282 il y a 2 ans
Parent
commit
7c2e0c77e4

+ 10 - 0
hx-kd100/src/main/java/com/fjhx/kd100/controller/config/ConfigInfoController.java

@@ -4,11 +4,13 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.kd100.entity.config.dto.ConfigInfoDto;
 import com.fjhx.kd100.entity.config.dto.ConfigInfoSelectDto;
+import com.fjhx.kd100.entity.config.po.ConfigInfo;
 import com.fjhx.kd100.entity.config.vo.ConfigInfoVo;
 import com.fjhx.kd100.service.config.ConfigInfoService;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,4 +76,12 @@ public class ConfigInfoController {
         configInfoService.delete(dto.getId());
     }
 
+    /**
+     * 获取当前租户快递100配置
+     */
+    @PostMapping("/getMyKd100Config")
+    public ConfigInfo getMyKd100Config() {
+        return configInfoService.getOne(q -> q.eq(ConfigInfo::getTenantId, SecurityUtils.getTenantId()));
+    }
+
 }

+ 6 - 1
hx-kd100/src/main/java/com/fjhx/kd100/entity/config/dto/ConfigInfoSelectDto.java

@@ -7,11 +7,16 @@ import lombok.Setter;
 /**
  * 租户快递100账户配置列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 @Getter
 @Setter
 public class ConfigInfoSelectDto extends BaseSelectDto {
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
 }

+ 1 - 0
hx-kd100/src/main/java/com/fjhx/kd100/service/config/impl/ConfigInfoServiceImpl.java

@@ -28,6 +28,7 @@ public class ConfigInfoServiceImpl extends ServiceImpl<ConfigInfoMapper, ConfigI
     public Page<ConfigInfoVo> getPage(ConfigInfoSelectDto dto) {
         IWrapper<ConfigInfo> wrapper = getWrapper();
         wrapper.orderByDesc("ci", ConfigInfo::getId);
+        wrapper.eq("ci", ConfigInfo::getTenantId, dto.getTenantId());
         Page<ConfigInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

+ 10 - 10
hx-kd100/src/main/resources/mapper/config/ConfigInfoMapper.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.kd100.mapper.config.ConfigInfoMapper">
     <select id="getPage" resultType="com.fjhx.kd100.entity.config.vo.ConfigInfoVo">
-        select
-            ci.id,
-            ci.kd_key,
-            ci.kd_customer,
-            ci.kd_secret,
-            ci.kd_user_id,
-            ci.create_user,
-            ci.create_time,
-            ci.update_user,
-            ci.update_time
+        select ci.id,
+               ci.kd_key,
+               ci.kd_customer,
+               ci.kd_secret,
+               ci.kd_user_id,
+               ci.tenant_id,
+               ci.create_user,
+               ci.create_time,
+               ci.update_user,
+               ci.update_time
         from config_info ci
             ${ew.customSqlSegment}
     </select>