Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/controller/OcpTenantController.java

@@ -41,8 +41,8 @@ public class OcpTenantController {
     }
     @GetMapping("/tenantselect")
     @ApiModelProperty("应用树分类--查询")
-    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){
-        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword);
+    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){
+        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev);
         return ResponseVO.ok(tree);
     }
 

src/main/java/com/pms/ocp/service/TenantService.java

@@ -48,6 +48,6 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * @param tenantGroupCompanyCode
      * @return
      */
-    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text);
+    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev);
 
 }

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

@@ -168,18 +168,17 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword) {
+    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) {
         LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
 
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
-            if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) {
-//                        List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
-                qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
-//                        page.setRecords(ocpTenantGroupList);
-                tenantMapper.selectPage(page, qw);
-
-            } else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) {
+         if(lev.equals("1")) {
+              List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
+              qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
+              page.setRecords(ocpTenantGroupList);
+              tenantMapper.selectPage(page, qw);
+         }else if (lev.equals("2") || lev.equals("3")) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
                 tenantMapper.selectPage(page, eq);
             }