From 585da4b632706e41e37dfaef833c41be371a8a91 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 04 六月 2025 15:06:27 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/product/mobile/core/controller/SignInController.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/controller/SignInController.java b/src/main/java/com/product/mobile/core/controller/SignInController.java
index c86aee4..de7750c 100644
--- a/src/main/java/com/product/mobile/core/controller/SignInController.java
+++ b/src/main/java/com/product/mobile/core/controller/SignInController.java
@@ -11,8 +11,12 @@
 import com.product.core.controller.support.AbstractBaseController;
 import com.product.core.entity.FieldSetEntity;
 import com.product.core.entity.RequestParameterEntity;
+import com.product.core.exception.BaseException;
+import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.mobile.core.config.MobileCoreCode;
 import com.product.mobile.core.service.SignInService;
 import com.product.module.sys.version.ApiVersion;
+import com.product.org.admin.config.CmnCode;
 
 /**
  *  鎵嬫満绛惧埌
@@ -41,8 +45,15 @@
             fse = reqp.getFormData();
         }
         //绛惧埌鏃讹紝濡傛灉涓婁紶浜唘uid锛岃〃绀猴紝寰佸鍏徃瑙勫畾鐨勮�冨嫟鐐圭殑绛惧埌锛屽惁鍒欒〃绀轰笉鍦ㄥ叕鍙歌瀹氱殑鑰冨嫟鐐圭殑绛惧埌(浠绘剰鍦扮偣绛惧埌銆�)
-        signInService.signIn(fse);
-        return this.OK();
+        try {
+	        signInService.signIn(fse);
+	        return this.OK();
+	    } catch (BaseException e) {
+	        return this.error(e);
+	    } catch (Exception e) {
+	    	
+	        return this.error(MobileCoreCode.SIGN_IN_FAIL);
+	    }
     }
 
     /**
@@ -60,7 +71,14 @@
             RequestParameterEntity reqp = (RequestParameterEntity) bean;
             fse = reqp.getFormData();
         }
-        return this.OK_List(signInService.signInList(fse));
+        try {
+        	return this.OK_List(signInService.signInList());
+	    } catch (BaseException e) {
+	        return this.error(e);
+	    } catch (Exception e) {
+	    	
+	        return this.error(MobileCoreCode.SIGN_IN_FAIL);
+	    }
     }
     /**
      * 鑾峰彇鍏徃鍥哄畾鑰冨嫟鐐圭殑淇℃伅
@@ -77,7 +95,15 @@
             RequestParameterEntity reqp = (RequestParameterEntity) bean;
             fse = reqp.getFormData();
         }
-
-        return this.OK_List(signInService.signInSites(null));
+        try {
+	        //鑾峰彇褰撳墠浜虹殑鍏徃
+	        return this.OK_List(signInService.signInSites(SpringMVCContextHolder.getCurrentUser().getCurrentCompany().getUUID()));
+        
+	    } catch (BaseException e) {
+	        return this.error(e);
+	    } catch (Exception e) {
+	    	
+	        return this.error(MobileCoreCode.SIGN_IN_FAIL);
+	    }
     }
 }

--
Gitblit v1.9.2