fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/classes/LexConsumableOrderManageController.cls

@@ -56,8 +56,13 @@
            List<CusCol> cols = new List<CusCol>();
            for (FieldSetMember fsm : fsmList) {
                //add by Link
<<<<<<< HEAD
                if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET') {
                } else {
=======
                if(fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET'){
                }else {
>>>>>>> LEXCommunityLiJun
                    CusCol col = new CusCol();
                    col.label = fsm.getLabel();
                    col.fieldName = fsm.getFieldPath();
@@ -125,11 +130,15 @@
            raesList = Database.query(soql);
            //add by rentx 2021-3-10 start
            //为 hasHop 赋值 判断当前经销商下是否有特价医院
<<<<<<< HEAD
            List<hospitalprice__c> hopList = [
                SELECT id, hospital__c
                FROM hospitalprice__c
                WHERE account__c = :accountid
            ];
=======
            List<hospitalprice__c> hopList = [SELECT id, hospital__c FROM hospitalprice__c WHERE account__c = :accountid];
>>>>>>> LEXCommunityLiJun
            if (hopList == null || hopList.size() == 0) {
                hasHop = false;
            } else {
@@ -147,11 +156,15 @@
                for (Account acc : contractList) {
                    dealIds.add(acc.Id);
                }
<<<<<<< HEAD
                List<Dealer_Product__c> deList = [
                    SELECT id
                    FROM Dealer_Product__c
                    WHERE Dealer_Contact__c IN :dealIds
                ];
=======
                List<Dealer_Product__c> deList = [SELECT id FROM Dealer_Product__c WHERE Dealer_Contact__c IN :dealIds];
>>>>>>> LEXCommunityLiJun
                if (deList == null || deList.size() == 0) {
                    hasSpecial = false;
                } else {
@@ -340,4 +353,8 @@
        @AuraEnabled
        public String fieldName;
    }
<<<<<<< HEAD
}
=======
}
>>>>>>> LEXCommunityLiJun