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 collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet()); List list = memberUserService.getByMobileList(collect); if (!CollectionUtils.isEmpty(list)) { List 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 deptRespDTOList = deptApi.getDeptList(); Map nameList = deptRespDTOList.stream().collect(toMap(DeptRespDTO::getParentOrganizationName, value -> value, (value1, value2) -> value1)); importUsers.forEach(importUser -> { 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) { // 校验是否存在 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 @@ 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 @@ - + + + + @@ -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 @@ + + + + + diff --git a/yudao-ui-app/static/images/qrcod.jpg b/yudao-ui-app/static/images/qrcod.jpg new file mode 100644 index 000000000..e235431a0 Binary files /dev/null and b/yudao-ui-app/static/images/qrcod.jpg differ