From 7044fe28f8ee34a208d202746c95b3558df97f43 Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Mon, 28 Mar 2022 13:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/ocp/model/entity/OcpTenantIocn.java   |  3 +++
 .../service/impl/AppRegisterServiceImpl.java  |  3 +--
 .../resources/mapper/AppRegisterMapper.xml    | 20 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
index f161daf..417d23d 100644
--- a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
+++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
@@ -42,6 +42,9 @@ public class OcpTenantIocn implements Serializable {
     @ApiModelProperty(value = "应用调用的服务数量图标数据")
     private Object iocn;
 
+    @ApiModelProperty(value = "图片类型")
+    private Object iocnKind;
+
     /**
      * 所属公司可能会根据公司分区
      */
diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
index ea7e6e7..07600a2 100644
--- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
@@ -51,8 +51,6 @@ public class AppRegisterServiceImpl implements AppRegisterService {
         ocpTenantIocn.setIocnType("tenant");
         ocpTenantIocn.setCodeNo(appRegisterDTO.getAppCode());
         ocpTenantIocn.setIocn(appRegisterDTO.getImgUrl());
-        // 加字段
-
         int n = ocpTenantIocnMapper.insert(ocpTenantIocn);
 
 
@@ -110,6 +108,7 @@ public class AppRegisterServiceImpl implements AppRegisterService {
             ocpTenantIocn.setIocnType("tenant");
             ocpTenantIocn.setCodeNo(item.getCodeNo());
             ocpTenantIocn.setIocn(item.getImg());
+            ocpTenantIocn.setIocnKind("Tenant_swiper");
             list.add(ocpTenantIocn);
         }
         int count = appRegisterMapper.batchInsert(list);
diff --git a/src/main/resources/mapper/AppRegisterMapper.xml b/src/main/resources/mapper/AppRegisterMapper.xml
index 571ce54..9c746a3 100644
--- a/src/main/resources/mapper/AppRegisterMapper.xml
+++ b/src/main/resources/mapper/AppRegisterMapper.xml
@@ -14,23 +14,23 @@
         INNER JOIN ocp_tenant_iocn icon ON base.tenant_code = icon.code_no
         INNER JOIN ocp_tenant_extent extent ON extent.tenant_code = base.tenant_code
         INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code
-        <where>
-            <if test="dto.kind != null and dto.kind != ''">
-                base.professional_kind like CONCAT('%', #{dto.kind}, '%')
-            </if>
-            <if test="dto.type != null and dto.type != ''">
-                and g.tenant_group_name like CONCAT('%', #{dto.type}, '%')
-            </if>
-        </where>
+        WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null
+        <if test="dto.kind != null and dto.kind != ''">
+            base.professional_kind like CONCAT('%', #{dto.kind}, '%')
+        </if>
+        <if test="dto.type != null and dto.type != ''">
+            and g.tenant_group_name like CONCAT('%', #{dto.type}, '%')
+        </if>
+
     </select>
 
     <insert id="batchInsert">
-        insert into ocp_tenant_iocn(obj_id, iocn_type, code_no, iocn, company_code)
+        insert into ocp_tenant_iocn(obj_id, iocn_type, code_no, iocn, company_code,iocn_kind)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.objId,jdbcType=VARCHAR},
             #{item.iocnType,jdbcType=VARCHAR},
-            #{item.codeNo},#{item.iocn},#{item.companyCode,jdbcType=VARCHAR})
+            #{item.codeNo},#{item.iocn},#{item.companyCode,jdbcType=VARCHAR},#{item.iocnKind,jdbcType=VARCHAR})
         </foreach>
     </insert>
 </mapper>
\ No newline at end of file
-- 
2.26.0