Merge remote-tracking branch 'origin/dev2' into prod-test

PCS/src/main/java/cn/cslg/permission/mapper/ClientMapper.java

@@ -25,5 +25,5 @@ public interface ClientMapper extends BaseMapper<Client> {
     //查找有租户id的客户
     List<Integer> queryTenantClients(@Param("params") Integer tenantId);
 
-    IPage<Client> getTenantClients(Page<Client> page,@Param("params") Integer tenantId);
+    IPage<Client> getTenantClients(Page<Client> page,@Param("params") ClientDTO vo);
 }

PCS/src/main/java/cn/cslg/permission/service/ClientService.java

@@ -205,7 +205,7 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
             PersonnelVO personnel = cacheUtils.getLoginUser(loginUtils.getId());
             params.setTenantId(personnel.getTenantId());
         }
-        IPage<Client> lst = this.baseMapper.getTenantClients(new Page<>(params.getCurrent(), params.getSize()), params.getTenantId());
+        IPage<Client> lst = this.baseMapper.getTenantClients(new Page<>(params.getCurrent(), params.getSize()), params);
         List<Client> list = lst.getRecords();
         this.loadClient(list);
         lst.setRecords(list);

PCS/src/main/resources/mapper/ClientMapper.xml

@@ -37,10 +37,15 @@
     </select>
 
     <select id="getTenantClients" resultType="cn.cslg.permission.domain.Client" parameterType="java.lang.Integer">
-        select * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
+        select *
+        from CLIENT a
+        left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
         <where>
-            b.TENANT_ID =#{params}
+            b.TENANT_ID =#{params.tenantId}
             and a.TENANT_ID is not null
+            <if test="params.name != null and params.name != ''">
+                and a.NAME like concat('%',#{params.name},'%')
+            </if>
         </where>
     </select>