Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-18 d3cbcd265d0ee70eca677972403afcff1a0fc990

Merge remote-tracking branch 'origin/master'

 home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java

@@ -74,6 +74,9 @@
//                filter += " and "+dataFilter;

//            }

//        }

        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){

            filter    = filter + " and " + queryFilterService.getQueryFilter(fs);

        }

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;


 product-server-admin/src/main/java/com/product/admin/service/OrganizationCacheService.java

@@ -246,8 +246,8 @@
        sql.append("\n a.org_level_type  ");
        sql.append("\n FROM  ");
        sql.append("\n product_sys_org_levels a ");
        sql.append("\n join product_sys_org_levels b on  b.org_level_status=0  ");
        sql.append("\n and (a.org_level_code_parent=b.org_level_code  OR (a.org_level_code_parent is null or a.org_level_code_parent=''))");
        sql.append("\n LEFT JOIN product_sys_org_levels b on  b.org_level_status=0  ");
        sql.append("\n and (a.org_level_code_parent=b.org_level_code  )");
        sql.append("\n where a.org_level_status=0  ");

        Object[] params = null;