From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/AssetMaintainController.cls | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/AssetMaintainController.cls b/force-app/main/default/classes/AssetMaintainController.cls
index 532f034..0d1ee3a 100644
--- a/force-app/main/default/classes/AssetMaintainController.cls
+++ b/force-app/main/default/classes/AssetMaintainController.cls
@@ -1,7 +1,7 @@
public with sharing class AssetMaintainController {
public static Asset StaticAssetQuertResult;
// 鎸夐挳鍖哄煙
- public String assertQueryCondition {get; private set;}
+ public String assertQueryCondition {get;set;}
public Boolean allBlueFlag {get; private set;} // 鏌ョ湅鍏ㄩ儴淇濇湁璁惧钃濊壊鎸夐挳Flag
public Boolean consumableBlueFlag {get; private set;} // 鏌ョ湅鍦ㄥ簱鐨勪繚鏈夎澶囪摑鑹叉寜閽瓼lag
public Boolean lendingBlueFlag {get; private set;} // 鏌ョ湅鍑哄�熶腑淇濇湁璁惧钃濊壊鎸夐挳Flag
@@ -1197,11 +1197,24 @@
}
private void fillShowList(Integer k){
+ // 20231021 chenjingwu lightning鏀归�� Start
+ if(!Test.isRunningTest() && allAssetInfoList.size() == 0 && assetFromSearchList.size() > 0 ){
+ allAssetInfoList.addAll(assetFromSearchList);
+ assetFromSearchList.clear();
+ }
+ // 20231021 chenjingwu lightning鏀归�� End
totalNum = allAssetInfoList.size();
totalPage = (totalNum / selctRecordNum) + (Math.mod(totalNum, selctRecordNum) > 0 ? 1 : 0); // 鎬婚〉
allAssetInfoShowList = new List<AssetInfo>();
Integer a = (k-1)*selctRecordNum;
Integer b = Math.min(k*selctRecordNum, allAssetInfoList.size());
+ System.debug('allAssetInfoList.size=>' + allAssetInfoList.size());
+ System.debug('a=>' + a);
+ System.debug('b=>' + b);
+ System.debug('k=>' + k);
+ System.debug('totalNum=>' + totalNum);
+ System.debug('totalPage=>' + totalPage);
+ System.debug('selctRecordNum=>' + selctRecordNum);
for (Integer i = a ; i < b ; i++) {
allAssetInfoShowList.add(allAssetInfoList[i]);
}
@@ -1605,6 +1618,7 @@
fieldValue = '';
}
Boolean meet = false;
+ System.debug(fieldValueInRecord + operator + String.valueOf(fieldValue));
if (operator == '==' && fieldValueInRecord == String.valueOf(fieldValue)) {
meet = true;
}
--
Gitblit v1.9.1