From 39844057bf0335800c49bfe68a9bb779188d3deb Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 26 Jul 2024 10:33:12 +0800
Subject: [PATCH] bug

---
 fuintAdmin_zt/src/views/Site/index.vue                       | 3 +++
 fuintAdmin_zt/src/views/setting/app/index.vue                | 3 +++
 fuintAdmin_zt/src/views/setting/banner/index.vue             | 3 +++
 fuintAdmin_zt/src/views/setting/hardware.vue                 | 5 +++++
 fuintAdmin_zt/src/views/setting/message.vue                  | 3 +++
 fuintAdmin_zt/src/views/setting/pay/index.vue                | 3 +++
 fuintAdmin_zt/src/views/system/menu/index.vue                | 1 +
 fuintAdmin_zt/src/views/system/notify/page/mode.vue          | 3 +++
 fuintAdmin_zt/src/views/system/notify/page/record.vue        | 4 ++++
 .../backendApi/controller/BackendSourceController.java       | 4 +++-
 10 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index dc1630dbc..821becca1 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -579,6 +579,7 @@
                       active-value="A"
                       inactive-value="N"
                       @change="handleStatusChangeDuty(scope.row)"
+                      :disabled="scope.row.dutyId==2"
                     ></el-switch>
                   </template>
                 </el-table-column>
@@ -595,6 +596,7 @@
                       icon="el-icon-edit"
                       v-hasPermi="['role:edit']"
                       @click="handleUpdate1(scope.row)"
+                      :disabled="scope.row.dutyId==2"
                     >修改</el-button>
                     <el-button
                       size="mini"
@@ -602,6 +604,7 @@
                       icon="el-icon-delete"
                       v-hasPermi="['role:delete']"
                       @click="handleDelete1(scope.row)"
+                      :disabled="scope.row.dutyId==2"
                     >删除</el-button>
                   </template>
                 </el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index fbeb358e8..b3786a6df 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -30,6 +30,7 @@
           <el-button
             type="primary"
             @click="handleAdd"
+            v-hasPermi="['setting:app:add']"
           >新增小程序配置</el-button>
         </el-form-item>
       </el-form>
@@ -65,12 +66,14 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['setting:app:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['setting:app:delete']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
index 2fb56754d..febfb7f1e 100644
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@@ -44,6 +44,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="handleAdd"
+              v-hasPermi="['setting:banner:add']"
             >新增banner图</el-button>
         </el-form-item>
       </el-form>
@@ -90,12 +91,14 @@
             type="text"
             icon="el-icon-view"
             @click="edit(scope.row)"
+            v-hasPermi="['setting:banner:edit']"
           >编辑</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="del(scope.row)"
+            v-hasPermi="['setting:banner:delete']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue
index 43d352c88..0b9147e53 100644
--- a/fuintAdmin_zt/src/views/setting/hardware.vue
+++ b/fuintAdmin_zt/src/views/setting/hardware.vue
@@ -41,6 +41,7 @@
             type="primary"
             icon="el-icon-plus"
             @click="handleAdd"
+            v-hasPermi="['setting:hardware:add']"
           >新增商品</el-button>
         </el-form-item>
       </el-form>
@@ -75,6 +76,7 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['setting:hardware:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
@@ -82,6 +84,7 @@
               icon="el-icon-top"
               v-if="scope.row.status == 0 "
               @click="shangjia(scope.row)"
+              v-hasPermi="['setting:hardware:grounding']"
             >上架</el-button>
             <el-button
               size="mini"
@@ -89,12 +92,14 @@
               icon="el-icon-bottom"
               v-if="scope.row.status == 1 "
               @click="shangjia(scope.row)"
+              v-hasPermi="['setting:hardware:offShelf']"
             >下架</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['setting:hardware:delete']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue
index 690b5aa11..86fb18fed 100644
--- a/fuintAdmin_zt/src/views/setting/message.vue
+++ b/fuintAdmin_zt/src/views/setting/message.vue
@@ -32,6 +32,7 @@
             type="primary"
             icon="el-icon-plus"
             @click="handleAdd"
+            v-hasPermi="['setting:message:add']"
           >新增短信模板</el-button>
         </el-form-item>
       </el-form>
@@ -68,12 +69,14 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['setting:message:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['setting:message:delete']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
index 6dc18289c..c3eba09f4 100644
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@@ -53,6 +53,7 @@
           <el-button
             type="primary"
             @click="handleAdd"
+            v-hasPermi="['setting:pay:add']"
           >新增支付参数</el-button>
         </el-form-item>
       </el-form>
@@ -108,12 +109,14 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['setting:pay:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['setting:pay:delete']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin_zt/src/views/system/menu/index.vue b/fuintAdmin_zt/src/views/system/menu/index.vue
index 3febb8892..e397a4cbe 100644
--- a/fuintAdmin_zt/src/views/system/menu/index.vue
+++ b/fuintAdmin_zt/src/views/system/menu/index.vue
@@ -319,6 +319,7 @@ export default {
               this.getList();
             });
           } else {
+            if(!this.form.merchantId) this.form.merchantId = "0"
             addMenu(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index 83074152c..f070232f1 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -41,6 +41,7 @@
           <el-button
             type="primary"
             @click="handleAdd"
+            v-hasPermi="['system:notify:addTemplate']"
           >新增通知模板</el-button>
         </el-form-item>
       </el-form>
@@ -69,12 +70,14 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['system:notify:editTemplate']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['system:notify:deleteTemplate']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index 8dbebbb6a..a7766c453 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -41,6 +41,7 @@
           <el-button
             type="primary"
             @click="handleAdd"
+            v-hasPermi="['system:notify:addRecord']"
           >新增通知</el-button>
         </el-form-item>
       </el-form>
@@ -66,18 +67,21 @@
               type="text"
               icon="el-icon-view"
               @click="edit(scope.row)"
+              v-hasPermi="['system:notify:editRecord']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="del(scope.row)"
+              v-hasPermi="['system:notify:deleteRecord']"
             >删除</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="send(scope.row.id)"
+              v-hasPermi="['system:notify:send']"
             >发送通知</el-button>
           </template>
         </el-table-column>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
index 51cb12613..f3c822826 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
@@ -120,11 +120,13 @@ public class BackendSourceController extends BaseController {
         String icon = param.get("icon").toString();
         String path = param.get("path").toString();
         String sort = param.get("sort").toString();
+        String merchantId = param.get("merchantId").toString();
         Integer isMenu = param.get("isMenu") == null ? 1 : Integer.parseInt(param.get("isMenu").toString());
 
         TSource addSource = new TSource();
         addSource.setSourceName(name);
-        addSource.setMerchantId(accountInfo.getMerchantId());
+//        addSource.setMerchantId(accountInfo.getMerchantId());
+        addSource.setMerchantId(Integer.valueOf(merchantId));
         addSource.setStatus(status);
         addSource.setNewIcon(icon);
         addSource.setIsLog(1);