diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 544b75913bed0d046d9f9ae8419ef4709216f673..c90a3cf992742128b94202745a830391e9d22776 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -210,8 +210,8 @@ public class ApiBasicManagementController { @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode,String apiPromotion) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode,apiPromotion); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode); return ResponseVO.ok(apiTreeGroupDtos); } @@ -222,4 +222,16 @@ public class ApiBasicManagementController { return ResponseVO.ok(apiBaseList); } + @ApiOperation("个人信息编辑中的模糊查询") + @GetMapping("/selectByCondition") + public ResponseVO >selectByCondition(@RequestParam(required = false) String apiCode, + @RequestParam(required = false) String apiName, + @RequestParam(required = false) String apiCenterCode, + @RequestParam(required = false) Integer pageNum, + @RequestParam(required = false) Integer pageSize){ + return apiBasicManagementService.selectByCondition(apiCode,apiName,apiCenterCode,pageNum,pageSize); + + } + + } diff --git a/src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java b/src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java index c28186c39679f55bd3031850fbb5195fb2f2426c..8fcec9444f3f9eb159a4767a7116f8f82963336a 100644 --- a/src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java +++ b/src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java @@ -42,8 +42,8 @@ public class ApiProvinceTreeController { @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode,String apiPromotion) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode,apiPromotion); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode); return ResponseVO.ok(apiTreeGroupDtos); } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 07d403f5440e11cc689efcbc444ae51bb6c6662e..bbe8ccf595dc0745e3776dc35b9507f6c24334d2 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -121,10 +121,11 @@ public class TenantBasicManagementController { return tenantBasicManagementService.getBaseByGroupCode(tenantDto); } - @ApiOperation("注册查询信息") - @GetMapping("/select/register") - public ResponseVO selectRegister(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) { - OcpTenantGroup ocpTenantGroup = tenantBasicManagementService.selectRegister(tenantGroupCode, tenantGroupCompanyCode); - return ResponseVO.ok(ocpTenantGroup); + + + @ApiOperation("个人信息中-编辑") + @PostMapping("/update") + public ResponseVO update(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ + return tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto); } } diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 20f067d1cdf4fca66b2051026113b70d50ff3dcb..66593617f52765319444bae0c2bb16fa758b8aa4 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -17,4 +17,6 @@ public interface ApiBasicManagementMapper extends BaseMapper { List selectApiExport(List list); List queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); + + List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java index ef9b7fff7dd03c54a3825e7ef77a1c9207d32e54..2b3b63e9371e25afad8df1e256a542a78c88c727 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java @@ -22,9 +22,9 @@ public interface OcpApiGroupMapper extends BaseMapper { List selectPageLists(ApiBaseDto apiBaseReq); - List apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType,String apiPromotion); + List apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType); - List selectBase(String apiGroupCompanyCode, String apiGroupPcode,String apiPromotion); + List selectBase(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); // List queryApiTreeData1(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index d5169f7c05991a19613ab67ba16785e2a232cb7c..d9d6ba79f24296eae3594aa0fcee6e351607789c 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -19,7 +19,7 @@ public interface OcpTenantGroupMapper extends BaseMapper { List selectPageLists(TenantDto tenantDto); - OcpTenantGroup selectRegister(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); + List selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode); } diff --git a/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java b/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java new file mode 100644 index 0000000000000000000000000000000000000000..0050e6d549b533c7e7b708688713895efae3792c --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java @@ -0,0 +1,66 @@ +package com.pms.ocp.model.dto; + +import com.pms.ocp.model.entity.OcpTenantBase; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ApiModel(value = "应用信息图标储存表dto") +public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable { + + /** + * 图标种类tenant:应用图标api:服务图标 + */ + @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标") + private String iocnType; + +// /** +// * 编码值 +// */ +// @ApiModelProperty(value = "编码值") +// private String codeNo; + + /** + * 应用调用的服务数量图标数据 + */ + @ApiModelProperty(value = "应用调用的服务数量图标数据") + private Object iocn; + + + + @ApiModelProperty(value = "服务编码字符串") + private String apiCodes; + + public String getIocnType() { + return iocnType; + } + + public void setIocnType(String iocnType) { + this.iocnType = iocnType; + } + + public Object getIocn() { + return iocn; + } + + public void setIocn(Object iocn) { + this.iocn = iocn; + } + + + + public String getApiCodes() { + return apiCodes; + } + + public void setApiCodes(String apiCodes) { + this.apiCodes = apiCodes; + } +} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java b/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java index 4d817cd699a673f60b4fa4d09bd2b8f9f410f8da..2d76d0624c44e267d122e88e0cfd533c9ac15ed3 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java @@ -40,7 +40,7 @@ public class OcpApiExtent { @ApiModelProperty("部署信息") private String deployment; - +//'0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''7.未发布 @ApiModelProperty("服务状态0未发布1已发布") private String apiState; diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 3576226a01bac9a698d71c0598823beb9c7b6ff9..abb0e07fcefd43bb5995957482b046406c7776a0 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -72,7 +72,7 @@ public interface ApiBasicManagementService extends IService { * @param apiGroupPcode * @return */ - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode,String apiPromotion); + List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode); /** * 根据分组code获取列表 @@ -89,6 +89,16 @@ public interface ApiBasicManagementService extends IService { */ List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); + + /** + * 编辑中的模糊查询 + * @param apiCode + * @param apiName + * @param apiCenterCode + * @return + */ + ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize); + // /** // * 服务列表2 // * @param wholeLinkParamDto diff --git a/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java new file mode 100644 index 0000000000000000000000000000000000000000..ccd79cdd9e6e9b1628775658a9cf27d6effeefba --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java @@ -0,0 +1,7 @@ +package com.pms.ocp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.entity.OcpTenantIocn; + +public interface OcpTenantIocnService extends IService { +} diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index e78eecd2aa6b6adf6773a10d494ccf014d931caa..a1cec12573871cee8c44384665f96eb9ef127934 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -80,21 +80,22 @@ public interface TenantBasicManagementService extends IService { */ List tenantBaseTree(String tenantGroupCode, String tenantGroupCompanyCode); + + /** - * 应用注册查询 + * 查询基础表 * @param tenantGroupCode * @param tenantGroupCompanyCode * @return */ - OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode); + List selectBase(String tenantGroupCode, String tenantGroupCompanyCode); /** - * 查询基础表 - * @param tenantGroupCode - * @param tenantGroupCompanyCode + * 个人信息中编辑 + * @param ocpBaseTiocnDto * @return */ - List selectBase(String tenantGroupCode, String tenantGroupCompanyCode); + ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto); /** * 应用树 diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index b7a047fb5e26a4b116a5523b7be4b322739f0554..5fcff1c101145990955ad9974bf6967f05b0a294 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; - import com.pms.ocp.mapper.ApiBasicManagementMapper; import com.pms.ocp.mapper.OcpApiExtentMapper; import com.pms.ocp.mapper.OcpApiGroupMapper; @@ -176,15 +175,15 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode, String apiPromotion) { - List ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType, apiPromotion); + public List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) { + List ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType); if (ocpApiGroups.size() != 0) { return ocpApiGroups; } else { if (StringUtils.isNotEmpty(apiCode)) { return Collections.EMPTY_LIST; } else { - List ocpGroupBaseDto = ocpApiGroupMapper.selectBase(apiGroupCompanyCode, apiGroupPcode, apiPromotion); + List ocpGroupBaseDto = ocpApiGroupMapper.selectBase(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType); if (ocpGroupBaseDto.size() != 0) { return ocpGroupBaseDto; } @@ -273,4 +272,23 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> selectByCondition(String apiCode, String apiName, String apiCenterCode, Integer pageNum, Integer pageSize) { + if (pageNum == null || pageSize == null) { + return ResponseVO.error("分页参数不能为空"); + } + + PageHelper.startPage(pageNum, pageSize); + List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode); + PageInfo pageInfo = new PageInfo<>(list); + return ResponseVO.ok(pageInfo); + } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..60b6644eda1ed8999c926c612f09ee4c4d182562 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java @@ -0,0 +1,11 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantIocnMapper; +import com.pms.ocp.model.entity.OcpTenantIocn; +import com.pms.ocp.service.OcpTenantIocnService; +import org.springframework.stereotype.Service; + +@Service +public class OcpTenantIocnServiceImpl extends ServiceImpl implements OcpTenantIocnService { +} diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 0553c3c6f36b2689c634c377abb85206f95bd737..265b8eb2498cbb64363f2ec3c96726f7928436b2 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -5,18 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.pms.ocp.mapper.OcpTenantAuditMapper; -import com.pms.ocp.mapper.OcpTenantExtentMapper; -import com.pms.ocp.mapper.OcpTenantGroupMapper; -import com.pms.ocp.mapper.TenantBasicManagementMapper; +import com.pms.ocp.mapper.*; import com.pms.ocp.model.dto.GroupDto; +import com.pms.ocp.model.dto.OcpBaseTiocnDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.TenantGroupVo; import com.pms.ocp.service.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +31,7 @@ import java.util.List; import java.util.stream.Collectors; @Service - +@Slf4j public class TenantBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { @Autowired private TenantBasicManagementMapper tenantBasicManagementMapper; @@ -48,7 +47,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantGroup = new ArrayList<>(); /** @@ -266,7 +266,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl selectBase(String tenantGroupCode, String tenantGroupCompanyCode) { + List groupDto = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); + return groupDto; } /** - * 应用树底层 + * 个人信息-编辑 * - * @param tenantGroupCode - * @param tenantGroupCompanyCode + * @param ocpBaseTiocnDto * @return */ - public List selectBase(String tenantGroupCode, String tenantGroupCompanyCode) { - List groupDto = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); - return groupDto; + @Override + public ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto) { + String tenantCode = ocpBaseTiocnDto.getTenantCode(); + OcpTenantBase ocpTenantBase = new OcpTenantBase(); + BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase); + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode); + boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2); + if (flag) { + log.info("应用基础表修改成功"); + System.out.println("应用基础表修改成功"); + } + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode); + boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper); + if (remove) { + log.info("图标表删除成功"); + System.out.println("图标表删除成功"); + } + + //添加新的数据到图标表 + OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); + Object iocn = ocpBaseTiocnDto.getIocn(); + String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode(); + ocpTenantIocn.setCodeNo(tenantCode); + ocpTenantIocn.setIocnType("tenant"); + ocpTenantIocn.setIocn(iocn); + ocpTenantIocn.setCompanyCode(ownerCompanyCode); + boolean save = ocpTenantIocnService.save(ocpTenantIocn); + if (save) { + log.info("添加图标表成功"); + System.out.println("添加图标表成功"); + } + //先删除应用服务关联 + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(OcpApiTenantRel::getTenantCode, tenantCode); + boolean remove1 = ocpApiTenantRelService.remove(lambdaQueryWrapper1); + if (remove1) { + log.info("要是有关联先删除,删除成功"); + } + String apiCodes = ocpBaseTiocnDto.getApiCodes(); + if (StringUtils.isEmpty(apiCodes)) { + return ResponseVO.error("请选择你要关联的服务"); + } + String[] split = apiCodes.split(","); + List apiCode = Arrays.asList(split); + for (String s : apiCode) { + OcpApiTenantRel ocpApiTenantRel = new OcpApiTenantRel(); + ocpApiTenantRel.setTenantCode(tenantCode); + ocpApiTenantRel.setApiCode(s); + ocpApiTenantRel.setApiDepCompanyCode(ownerCompanyCode); + ocpApiTenantRel.setTenantDepCompanyCode(ownerCompanyCode); + ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now())); + ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now())); + boolean save1 = ocpApiTenantRelService.save(ocpApiTenantRel); + if (save1) { + log.info("添加关联表成功"); + } + } + return ResponseVO.ok(); } /** diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml index cb329adcda9816f9a896922dd71fa28eed774341..d9fbbc646ad923ff574b93a45ec600b23dfc9d6f 100644 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ b/src/main/resources/mapper/ApiBasicManagementMapper.xml @@ -68,4 +68,22 @@ limit #{pageNum} offset #{pageSize} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index da58565fa4d4302813f8329ba5d3e85be703b8ba..4b96d4125975722ebfa420263c8d71b9231cf683 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -65,9 +65,7 @@ and api_group_promotion_type =#{apiGroupPromotionType} - - and api_group_promotion_type=#{apiPromotion} - + @@ -117,8 +115,8 @@ and owner_company_code =#{apiGroupCompanyCode} - - and api_promotion=#{apiPromotion} + + and api_promotion=#{apiGroupPromotionType} diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index ca9fef4e5fd4c3e1f3d970df93d2f0b2f01e8cde..4d05cafef08d123716f9db8b48169ef52c39506b 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -21,7 +21,7 @@ tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group where is_delete = 0 - and tenant_group_pcode = '' + and tenant_group_pcode is null and tenant_group_company_code=#{tenantGroupCompanyCode} @@ -68,17 +68,7 @@ -