From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/classes/UploadOBPMController.cls |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/force-app/main/default/classes/UploadOBPMController.cls b/force-app/main/default/classes/UploadOBPMController.cls
index 9b39eba..3c7ceb4 100644
--- a/force-app/main/default/classes/UploadOBPMController.cls
+++ b/force-app/main/default/classes/UploadOBPMController.cls
@@ -109,9 +109,9 @@
                 userIdList.add(ob.cam.Shared_User__c);
             }
         }
+        String SharedEditing = '';
+        String CarbonCopy = '';
         if(userIdList.size() > 0){
-            String SharedEditing = '';
-            String CarbonCopy = '';
             List<User> userList = [select id, Employee_No__c from User where id = :userIdList];
             for(User user : userList){
                 userMap.put(user.id, user.Employee_No__c);
@@ -127,31 +127,31 @@
                     }
                 }
             }
-            //鎴彇鎺塶ull鍜屾渶鍚庣殑閫楀彿
-            SharedEditing = SharedEditing.length() > 0 ? SharedEditing.substring(0, SharedEditing.lastIndexOf(',')) : '';
-            CarbonCopy = CarbonCopy.length() > 0 ? CarbonCopy.substring(0, CarbonCopy.lastIndexOf(',')) : '';
-            cam.Shared_Editing__c = SharedEditing;
-            cam.Carbon_Copy__c = CarbonCopy;
-            camList.add(cam);
         }
+        //鎴彇鎺塶ull鍜屾渶鍚庣殑閫楀彿
+        SharedEditing = SharedEditing.length() > 0 ? SharedEditing.substring(0, SharedEditing.lastIndexOf(',')) : '';
+        CarbonCopy = CarbonCopy.length() > 0 ? CarbonCopy.substring(0, CarbonCopy.lastIndexOf(',')) : '';
+        cam.Shared_Editing__c = SharedEditing;
+        cam.Carbon_Copy__c = CarbonCopy;
+        cam.Is_Upload_To_OBPM_Success__c = true;
+        camList.add(cam);
         errorStr = '';
         Savepoint sp = Database.setSavepoint();
-        // try {
+        try {
             if(camList.size() > 0){
                 update camList;
-
-                // 703鎺ュ彛瑙﹀彂
-                List<String> cam_ids = new List<String>();
-                cam_ids.add(cam.Id);
-                NFM703Controller.callout(null,cam_ids);
             }
-        // } catch (System.Exception e) {
-        //     Database.rollback(sp);
-        //     ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, e.getMessage()));
-        //     errorStr = e.getMessage();
-        //     hasError = true;
-        //     return null;
-        // }
+            // 703鎺ュ彛瑙﹀彂
+            List<String> cam_ids = new List<String>();
+            cam_ids.add(cam.Id);
+            NFM703Controller.callout(null,cam_ids);
+
+        } catch (System.Exception e) {
+            Database.rollback(sp);
+            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, e.getMessage()));
+            errorStr = e.getMessage();
+            hasError = true;
+        }
     }
 
     public class OBPMInfo {

--
Gitblit v1.9.1