From 6916b64e8dc5cbf7f790a418c97ccc8270c031ae Mon Sep 17 00:00:00 2001
From: dushixiang <helloworld1024@foxmail.com>
Date: Sun, 13 Nov 2022 22:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=8C=E5=89=8D=E7=AB=AFbu?=
 =?UTF-8?q?g=EF=BC=9A=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=8E=A5=E5=85=A5=E7=BD=91=E5=85=B3=EF=BC=8C?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8E=E4=B8=8D=E7=94=9F=E6=95=88=E3=80=8D?=
 =?UTF-8?q?fixed=20#306?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/service/asset.go                | 12 +++++++-----
 web/src/components/asset/AssetModal.js |  7 -------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/server/service/asset.go b/server/service/asset.go
index df49195d..989b0ed4 100644
--- a/server/service/asset.go
+++ b/server/service/asset.go
@@ -267,21 +267,23 @@ func (s assetService) UpdateById(id string, m maps.Map) error {
 		item.Description = "-"
 	}
 
+	if item.AccessGatewayId == "" {
+		item.AccessGatewayId = "-"
+	}
+
 	if err := s.Encrypt(&item, config.GlobalCfg.EncryptionPassword); err != nil {
 		return err
 	}
-	return env.GetDB().Transaction(func(tx *gorm.DB) error {
-		c := s.Context(tx)
 
-		if err := repository.AssetRepository.UpdateById(c, &item, id); err != nil {
+	return s.Transaction(context.Background(), func(ctx context.Context) error {
+		if err := repository.AssetRepository.UpdateById(ctx, &item, id); err != nil {
 			return err
 		}
-		if err := repository.AssetRepository.UpdateAttributes(c, id, item.Protocol, m); err != nil {
+		if err := repository.AssetRepository.UpdateAttributes(ctx, id, item.Protocol, m); err != nil {
 			return err
 		}
 		return nil
 	})
-
 }
 
 func (s assetService) FixSshMode() error {
diff --git a/web/src/components/asset/AssetModal.js b/web/src/components/asset/AssetModal.js
index d0446152..7c327691 100644
--- a/web/src/components/asset/AssetModal.js
+++ b/web/src/components/asset/AssetModal.js
@@ -61,8 +61,6 @@ const AssetModal = function ({
     let [tags, setTags] = useState([]);
     let [credentials, setCredentials] = useState([]);
 
-    const [current, setCurrent] = useState(0);
-
     const getStorages = async () => {
         const result = await request.get('/storages/shares');
         if (result.code === 1) {
@@ -70,11 +68,6 @@ const AssetModal = function ({
         }
     }
 
-    const handleStepChange = (value) => {
-        console.log('onChange:', current);
-        setCurrent(value);
-    };
-
     useEffect(() => {
 
         const getItem = async () => {