Merge remote-tracking branch 'origin/develop_3' into develop_3

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
2021-07-26 20:12:12 +08:00
parent 9cd93436c4 7e50bf88b0
commit f4c7b2ba68
74 changed files with 1992 additions and 344 deletions
@@ -151,6 +151,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                page.setAdvanceSearchStr(null);
            }
        }
+        page.setUserId(LoginUserUtil.getUserId());
        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
        return Result.success(getPageInfo(page.getPager(), rows));
    }