From 1727a4f4d02e429475608e60f142a63bc24127bc Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 23 十月 2023 10:07:34 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/CheckAllOlympusAssetController.cls | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/CheckAllOlympusAssetController.cls b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
index 3a70581..692a3f7 100644
--- a/force-app/main/default/classes/CheckAllOlympusAssetController.cls
+++ b/force-app/main/default/classes/CheckAllOlympusAssetController.cls
@@ -424,6 +424,7 @@
if (beipinCunFangDi=='骞垮窞 澶囧搧涓績' || beipinCunFangDi=='鍖椾含 澶囧搧涓績' || beipinCunFangDi=='涓婃捣 澶囧搧涓績') {
angecylookrole =true;
}
+ System.debug('angecylookrole===' + angecylookrole);
setAssetFieldSetInfo();//20210628 1650 you 鎸釜浣嶇疆
if (UserInfo.getProfileId() == System.Label.ProfileId_SystemAdmin || System.Label.ProfileId_EquCenAdmin.contains(UserInfo.getProfileId())) {
internalAssetLocationLogin = FixtureUtil.bieCunFangDiOpsMap.get('澶囧搧绠＄悊涓績')[0].getValue(); // SelectOption('All', '--鍏ㄩ儴--')
@@ -758,6 +759,7 @@
}
System.debug('oldAssetInfoList===' + oldAssetInfoList);
checkedAssetInfoNum = oldAssetInfoList.size();
+ System.debug('oldAssetInfoListSize===' + oldAssetInfoList.size());
allAssetInfoList.clear();
totalFixDataNum = oldAssetInfoList.size(); // 鎵撳嬀鍥哄畾鏁版嵁鏁伴噺
@@ -968,6 +970,7 @@
}
System.debug('currPage===' + currPage);
System.debug('totalPage===' + totalPage);
+ System.debug('selctRecordNum===' + selctRecordNum);
if (selRecordOption != NONE) {
// selRecordOption = String.valueOf(Integer.valueOf(selRecordOption) + checkedAssetInfoNum);
if (currPage == 1) {
@@ -977,7 +980,12 @@
soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
System.debug('Last page;');
} else {
- soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
+ if(oldAssetInfoList.size() > 10 && currPage == 2){
+ soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage) * selctRecordNum - checkedAssetInfoNum);
+ }else{
+ soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
+ }
+
}
}
// 鏈�缁堟绱㈢粨鏋�
--
Gitblit v1.9.1