From 16e38703c79180d3ff99a3f6d3c49cc0a3a2b3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 9 Feb 2023 20:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=A7=9F=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/datasource/mappers/TenantMapperEx.java    | 4 +++-
 .../java/com/jsh/erp/service/tenant/TenantComponent.java  | 6 ++++--
 .../java/com/jsh/erp/service/tenant/TenantService.java    | 8 ++++----
 .../src/main/resources/mapper_xml/TenantMapperEx.xml      | 8 ++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
index 25c88079..fbb8748f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
@@ -12,11 +12,13 @@ public interface TenantMapperEx {
             @Param("loginName") String loginName,
             @Param("type") String type,
             @Param("enabled") String enabled,
+            @Param("remark") String remark,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
     Long countsByTenant(
             @Param("loginName") String loginName,
             @Param("type") String type,
-            @Param("enabled") String enabled);
+            @Param("enabled") String enabled,
+            @Param("remark") String remark);
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
index eae6397d..470a65e4 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
@@ -36,7 +36,8 @@ public class TenantComponent implements ICommonQuery {
         String loginName = StringUtil.getInfo(search, "loginName");
         String type = StringUtil.getInfo(search, "type");
         String enabled = StringUtil.getInfo(search, "enabled");
-        return tenantService.select(loginName, type, enabled, QueryUtils.offset(map), QueryUtils.rows(map));
+        String remark = StringUtil.getInfo(search, "remark");
+        return tenantService.select(loginName, type, enabled, remark, QueryUtils.offset(map), QueryUtils.rows(map));
     }
 
     @Override
@@ -45,7 +46,8 @@ public class TenantComponent implements ICommonQuery {
         String loginName = StringUtil.getInfo(search, "loginName");
         String type = StringUtil.getInfo(search, "type");
         String enabled = StringUtil.getInfo(search, "enabled");
-        return tenantService.countTenant(loginName, type, enabled);
+        String remark = StringUtil.getInfo(search, "remark");
+        return tenantService.countTenant(loginName, type, enabled, remark);
     }
 
     @Override
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
index 7d485d75..60d0bd28 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
@@ -71,11 +71,11 @@ public class TenantService {
         return list;
     }
 
-    public List<TenantEx> select(String loginName, String type, String enabled, int offset, int rows)throws Exception {
+    public List<TenantEx> select(String loginName, String type, String enabled, String remark, int offset, int rows)throws Exception {
         List<TenantEx> list= new ArrayList<>();
         try{
             if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) {
-                list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, offset, rows);
+                list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, remark, offset, rows);
                 if (null != list) {
                     for (TenantEx tenantEx : list) {
                         tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime()));
@@ -89,11 +89,11 @@ public class TenantService {
         return list;
     }
 
-    public Long countTenant(String loginName, String type, String enabled)throws Exception {
+    public Long countTenant(String loginName, String type, String enabled, String remark)throws Exception {
         Long result=null;
         try{
             if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) {
-                result = tenantMapperEx.countsByTenant(loginName, type, enabled);
+                result = tenantMapperEx.countsByTenant(loginName, type, enabled, remark);
             }
         }catch(Exception e){
             JshException.readFail(logger, e);
diff --git a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
index 65eba7f0..a295e60c 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
@@ -21,6 +21,10 @@
         <if test="enabled != null and enabled != ''">
             and enabled = #{enabled}
         </if>
+        <if test="remark != null">
+            <bind name="bindRemark" value="'%'+remark+'%'"/>
+            and remark like #{bindRemark}
+        </if>
         order by id desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -41,5 +45,9 @@
         <if test="enabled != null and enabled != ''">
             and enabled = #{enabled}
         </if>
+        <if test="remark != null">
+            <bind name="bindRemark" value="'%'+remark+'%'"/>
+            and remark like #{bindRemark}
+        </if>
     </select>
 </mapper>
\ No newline at end of file