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 f161dafcd8c9cae01fb8cbff0507d2d00d4d1491..417d23d8bc29f31ea925b16aae9b676a023c50ea 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 ea7e6e78e9307c482b88ee418b0171601d28f9bf..07600a201d5f57542e3233b97c29eb238cb587f7 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 571ce540b1cdcd82d7b5a512420ddb261d546c76..9c746a32be491f109d3f705a0bc1dc3ce7f1f0ab 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 - - - base.professional_kind like CONCAT('%', #{dto.kind}, '%') - - - and g.tenant_group_name like CONCAT('%', #{dto.type}, '%') - - + WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null + + base.professional_kind like CONCAT('%', #{dto.kind}, '%') + + + and g.tenant_group_name like CONCAT('%', #{dto.type}, '%') + + - 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 (#{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}) \ No newline at end of file