合并分支 'dev_20230216' 到 'master'

Dev 20230216 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!75
2023-05-12 13:55:40 +08:00
parent f018df2892 1b1389f236
commit 97b132b1da
3 changed files with 49 additions and 9 deletions
@@ -583,6 +583,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
        Integer rowCount = dao.getSarStandardsInfoCount(page);
        page.getPager().setRowCount(rowCount);
        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "0");
+        if(sarlist.isEmpty()){
+            page.setStandName(page.getStandNumber());
+            page.setStandNumber(null);
+             rowCount = dao.getSarStandardsInfoCount(page);
+            page.getPager().setRowCount(rowCount);
+            sarlist = dao.getSarStandardsInfoPage(page, "0");
+        }
        attrInfoCollect(sarlist);
        return sarlist;
    }