From 74e6a383570060d05c58f731fa7cd9f241db50bd Mon Sep 17 00:00:00 2001
From: twysparks <twysparks@163.com>
Date: 星期四, 20 四月 2023 14:07:42 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/classes/ApplicationButtonController.cls |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/classes/ApplicationButtonController.cls b/force-app/main/default/classes/ApplicationButtonController.cls
index ad88920..9910696 100644
--- a/force-app/main/default/classes/ApplicationButtonController.cls
+++ b/force-app/main/default/classes/ApplicationButtonController.cls
@@ -16,6 +16,7 @@
     //鎺堟潈鐢宠鐨勬彁浜ゆ寜閽�
     @AuraEnabled
     public static String submit(String recordId) {
+       String messageText = '';
        try {
         Request_tedner_doc__c rac = [SELECT 	Id,Status__c,Submit_check_flag__c,RecordTypeId,Submit_time__c FROM Request_tedner_doc__c WHERE Id = :recordId LIMIT 1];
         rac.Status__c = LightingButtonConstant.STATUS_Application_Submitted;
@@ -23,18 +24,19 @@
         rac.Submit_check_flag__c = true;
         rac.Submit_time__c = Datetime.now();
         update rac;
-        return '1';
+        messageText = '1';
+        return messageText;
        } catch (Exception ex) {
         System.debug(LoggingLevel.INFO, '*** xu: ' + ex);
-        return ex.getMessage();
-       } finally {
-
+        messageText = ex.getMessage();
+        return messageText;
        }
     }
 
     //鎺堟潈鐢宠鐨勫彇娑堟彁浜ゆ寜閽�
     @AuraEnabled
     public static String submitCancel(String recordId) {
+       String messageText = '';
        try {
         Request_tedner_doc__c report = [SELECT 	Id,Status__c,Submit_check_flag__c,RecordTypeId,Submit_time__c FROM Request_tedner_doc__c WHERE Id = :recordId LIMIT 1];
         report.Status__c = LightingButtonConstant.STATUS_Application_CancelSubmit;
@@ -42,18 +44,18 @@
         report.Submit_check_flag__c = false;
         report.Submit_time__c = null;
         update report;
-        return '1';
+        messageText = '1';
+        return messageText;
        } catch (Exception ex) {
         System.debug(LoggingLevel.INFO, '*** cancelXu: ' + ex);
-        return ex.getMessage();
-       } finally {
-
+        messageText = ex.getMessage();
+        return messageText;
        }
     }
 
     //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
     @AuraEnabled
-    public static UserResult UserInfo_Owner() {
+    public static UserResult userInfo_Owner() {
         UserResult result = new UserResult();
         ID myUserID = UserInfo.getUserId();
         try { 

--
Gitblit v1.9.1