Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java

@@ -24,7 +24,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     /**
      * 二级树
      * @param apiGroupPromotionType
-     * @return
+     *  /.  * @return
      */
     List<OcpApiGroup>  selectTwoApiGroups(Long apiGroupPromotionType);
 
@@ -40,6 +40,6 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
   //根据code查询整条数据
   OcpApiGroup selectCode(String code);
 
-  //根据code查询是否=含有下级服务
-    List<OcpApiGroup> selectGroupPcode();
+  //根据code查询是否含有下级服务
+    List<OcpApiGroup> selectGrpPcode();
 }

src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java

@@ -138,7 +138,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
         queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode());
         String objId = ocpApiGroup.getObjId();
 
-        List<OcpApiGroup> list = mapper.selectGroupPcode();
+        List<OcpApiGroup> list = mapper.selectGrpPcode();
         if (list.size() >= 1) {
             flag = false;
         }

src/main/resources/mapper/OcpApiTreeMapper.xml

@@ -7,7 +7,7 @@
     </select>
 <!--    一级树-->
     <select id="selectTwoApiGroups" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType};
+       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = '';
     </select>
 <!--二级-->
     <select id="selectThreeApiGroupsList" resultType="com.pms.ocp.model.entity.OcpApiGroup">