From a1f6946fc4ea99d107bae69c29ac3cba055dbb66 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 1 Jun 2023 11:45:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/service/dept/DeptServiceImpl.java      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index ab6eca2b6..6d34d8d50 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -154,15 +154,6 @@ public class DeptServiceImpl implements DeptService {
         deptProducer.sendDeptRefreshMessage();
     }
 
-    public static void main(String[] args) {
-        String words = "创盈云>测试删除1";
-
-        System.out.println("原始字符串是'" + words + "'");
-
-        System.out.println("replace(\"r's\",\"is\")结果：" + words.replace("测试删除1", "测试删除"));
-
-    }
-
     @Override
     public void deleteDept(Long id) {
         // 校验是否存在

From 55abca51298b894fae3e142d577d8d9b21ec8367 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Thu, 1 Jun 2023 11:53:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=85=AC=E4=BC=97=E5=8F=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/tenant/index.vue         |  12 +++---
 yudao-ui-app/pages.json                       |   6 +++
 yudao-ui-app/pages/user/index.vue             |   7 +++-
 yudao-ui-app/pages/users/wechat/index.vue     |  36 ++++++++++++++++++
 yudao-ui-app/static/images/qrcod.jpg          | Bin 0 -> 28060 bytes
 5 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 yudao-ui-app/pages/users/wechat/index.vue
 create mode 100644 yudao-ui-app/static/images/qrcod.jpg

diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index c9d1bc33b..a3ce9f4d6 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -71,7 +71,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" @click="handleLook(scope.row)"
-                     v-hasPermi="['system:tenant:update']">查看
+                     v-hasPermi="['system:tenant:look']">查看
           </el-button>
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:tenant:update']">编辑
@@ -85,7 +85,7 @@
           >
             <canvas :id="`id-${scope.row.id}`" width="120" height="120"></canvas>
             <el-button slot="reference" size="mini" type="text" @click="handleQRCode(scope.row)"
-                       v-hasPermi="['system:tenant:delete']">推广码
+                       v-hasPermi="['system:tenant:qrcode']">推广码
             </el-button>
           </el-popover>
           <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
@@ -93,13 +93,13 @@
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDisabled" size="mini" type="text" icon="el-icon-video-pause"
-                                v-hasPermi="['system:tenant:delete']">禁用</el-dropdown-item>
+                                v-hasPermi="['system:tenant:disable']">禁用</el-dropdown-item>
               <el-dropdown-item command="handleCommission" size="mini" type="text" icon="el-icon-set-up"
-                                v-hasPermi="['system:tenant:delete']">提成设置</el-dropdown-item>
+                                v-hasPermi="['system:tenant:commission']">提成设置</el-dropdown-item>
               <el-dropdown-item command="handleNotice" size="mini" type="text" icon="el-icon-chat-round"
-                                v-hasPermi="['system:tenant:delete']">通知公告</el-dropdown-item>
+                                v-hasPermi="['system:tenant:notice']">通知公告</el-dropdown-item>
               <el-dropdown-item command="handleBanner" size="mini" type="text" icon="el-icon-picture-outline"
-                                v-hasPermi="['system:tenant:delete']">轮播图</el-dropdown-item>
+                                v-hasPermi="['system:tenant:banner']">轮播图</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 48d8bd498..cf7acbb29 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -204,6 +204,12 @@
 						"navigationBarTitleText": "用户协议"
 					}
 				},
+        {
+        	"path": "wechat/index",
+        	"style": {
+        		"navigationBarTitleText": "关注公众号"
+        	}
+        },
 				{
 					"path": "web_page/index",
 					"style": {
diff --git a/yudao-ui-app/pages/user/index.vue b/yudao-ui-app/pages/user/index.vue
index 4a36a095d..77ba36299 100644
--- a/yudao-ui-app/pages/user/index.vue
+++ b/yudao-ui-app/pages/user/index.vue
@@ -104,9 +104,12 @@
               <u-cell title="热线电话" value="400-8009935" isLink @click="callPhone">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon>
               </u-cell>
-              <u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
+              <u-cell title="在线客服" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon4.png"></u-icon>
               </u-cell>
+              <u-cell title="扫码关注公众号" isLink @click="jumpPage('/pages/users/wechat/index')">
+                <u-icon slot="icon" name="weixin-fill" size="45"></u-icon>
+              </u-cell>
             </u-cell-group>
           </view>
           <view class="uni-p-b-98"></view>
@@ -378,7 +381,7 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 616rpx;
+    height: 100%;
     background: linear-gradient(0deg, #F94B78 0%, #FFD35C 100%);
     opacity: 0.18;
     z-index: 0
diff --git a/yudao-ui-app/pages/users/wechat/index.vue b/yudao-ui-app/pages/users/wechat/index.vue
new file mode 100644
index 000000000..36992c2b7
--- /dev/null
+++ b/yudao-ui-app/pages/users/wechat/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <view class="wechat-wrap">
+    <u-navbar autoBack title="关注公众号"></u-navbar>
+    <view class="bg"></view>
+    <image src="@/static/images/qrcod.jpg" mode="widthFix" style="width: 400rpx;"></image>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style lang="scss" scoped>
+  page,
+  body {
+    height: 100%;
+  }
+
+  .bg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(0deg, #F94B78 0%, #FFD35C 100%);
+    opacity: 0.18;
+    z-index: 0
+  }
+
+  .wechat-wrap {
+    width: 100%;
+    min-height: 100%;
+    padding: 260rpx 20rpx 0 20rpx;
+    text-align: center;
+  }
+</style>
diff --git a/yudao-ui-app/static/images/qrcod.jpg b/yudao-ui-app/static/images/qrcod.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e235431a0f6b0670d31febaa3c6a2890d2949e24
GIT binary patch
literal 28060
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

literal 0
HcmV?d00001


From 236d4b566be5406c7b6c0e9a6757f0d0b081d074 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 1 Jun 2023 12:02:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/promoter/PromoterServiceImpl.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
index 78c8b8ac1..26078984b 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
@@ -181,14 +181,15 @@ public class PromoterServiceImpl implements PromoterService {
         if (CollUtil.isEmpty(importUsers)) {
             throw exception(PROMOTER_IMPORT_LIST_IS_EMPTY);
         }
+        PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
+                .updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
         Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
         List<MemberUserDO> list = memberUserService.getByMobileList(collect);
         if (!CollectionUtils.isEmpty(list)) {
             List<String> collect1 = list.stream().map(MemberUserDO::getMobile).collect(Collectors.toList());
-            throw new ServiceException(200, "电话号码:" + collect1 + "重复");
+            respVO.getFailureUsernames().put("电话号码:" + collect1, "重复");
         }
-        PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
-                .updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
+
         List<DeptRespDTO> deptRespDTOList = deptApi.getDeptList();
         Map<String, DeptRespDTO> nameList = deptRespDTOList.stream().collect(toMap(DeptRespDTO::getParentOrganizationName, value -> value, (value1, value2) -> value1));
         importUsers.forEach(importUser -> {