From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeReferConfigMapper.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeReferConfigMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeReferConfigMapper.java
index 73ddf34..e82ef9f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeReferConfigMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeReferConfigMapper.java
@@ -1,6 +1,10 @@
 package com.vci.ubcs.code.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.vci.ubcs.code.dto.CodeReferConfigDTO;
 import com.vci.ubcs.code.entity.CodeReferConfig;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -9,10 +13,10 @@
 /**
  * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ暟鎹簱璁块棶灞�
  *
- * @author makejava
+ * @author ludc
  * @since 2023-05-19 17:47:51
  */
-public interface CodeReferConfigMapper extends BaseMapper<CodeReferConfig> {
+public interface CodeReferConfigMapper extends MPJBaseMapper<CodeReferConfig> {
 
     /**
      * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -26,10 +30,10 @@
      * 鏌ヨ鎸囧畾琛屾暟鎹�
      *
      * @param codeReferConfig 鏌ヨ鏉′欢
-     * @param pageable         鍒嗛〉瀵硅薄
+     * @param page         鍒嗛〉瀵硅薄
      * @return 瀵硅薄鍒楄〃
      */
-    List<CodeReferConfig> queryAllByPage(CodeReferConfig codeReferConfig, @Param("pageable") Pageable pageable);
+    IPage<CodeReferConfig> selectJoinPage(@Param("codeReferConfig") CodeReferConfig codeReferConfig, IPage page);
 
 }
 

--
Gitblit v1.9.3