From a33bd95b9ad7c07c2daa54f2a062a4d0461f590b Mon Sep 17 00:00:00 2001 From: Mrking <782276617@qq.com> Date: Sun, 17 Nov 2024 12:06:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/json/customer_menu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json index 1276005..65ce12b 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json @@ -14,7 +14,7 @@ { "id": 2830, "parentId": 2828, - "name": "销售订单", + "name": "我的订单", "path": "sale-order", "component": "oms/saleorder/index", "componentName": "SaleOrder", From be124b6763c9167b08f7d972980b344b16ce03f1 Mon Sep 17 00:00:00 2001 From: Mrking <782276617@qq.com> Date: Sun, 17 Nov 2024 23:20:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=93=81=E7=89=8C=E5=85=B3=E7=B3=BB=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/user/vo/user/UserRespVO.java | 3 +++ .../system/dal/mysql/brand/UserBrandMapper.java | 11 +++++++---- .../module/system/dal/mysql/dept/DeptMapper.java | 3 ++- .../system/service/user/AdminUserServiceImpl.java | 4 ++-- .../src/views/system/user/UserForm.vue | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/user/vo/user/UserRespVO.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/user/vo/user/UserRespVO.java index 5c8281b..cbb1d19 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -40,6 +40,9 @@ public class UserRespVO{ @Schema(description = "岗位编号数组", example = "1") private Set postIds; + @Schema(description = "品牌编号数组", example = "1") + private Set brandIds; + @Schema(description = "用户邮箱", example = "hangtag@iocoder.cn") @ExcelProperty("用户邮箱") private String email; diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/brand/UserBrandMapper.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/brand/UserBrandMapper.java index efa4d24..7de4d2b 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/brand/UserBrandMapper.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/brand/UserBrandMapper.java @@ -17,10 +17,13 @@ public interface UserBrandMapper extends BaseMapperX { return selectList(UserBrandDO::getUserId, userId); } - default void deleteByUserIdAndPostId(Long userId, Collection postIds) { - delete(new LambdaQueryWrapperX() - .eq(UserBrandDO::getUserId, userId) - .in(UserBrandDO::getBrandId, postIds)); + default void deleteByUserIdAndBrandId(Long userId, Collection brandIds) { + LambdaQueryWrapperX update = new LambdaQueryWrapperX<>(); + update.eq(UserBrandDO::getUserId, userId); + if(brandIds!=null && brandIds.size()>0){ + update.in(UserBrandDO::getBrandId, brandIds); + } + delete(update); } default List selectListByBrandIds(Collection brandIds) { diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/dept/DeptMapper.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/dept/DeptMapper.java index a6fc5be..53ea232 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/dept/DeptMapper.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/dept/DeptMapper.java @@ -15,7 +15,8 @@ public interface DeptMapper extends BaseMapperX { default List selectList(DeptListReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .likeIfPresent(DeptDO::getName, reqVO.getName()) - .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())); + .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()) + .ne(DeptDO::getName, "客户")); } default DeptDO selectByParentIdAndName(Long parentId, String name) { diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java index 8ce7018..57b2a67 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java @@ -172,8 +172,8 @@ public class AdminUserServiceImpl implements AdminUserService { userBrandMapper.insertBatch(convertList(createBrandIds, brandId -> new UserBrandDO().setUserId(userId).setBrandId(brandId))); } - if (!CollectionUtil.isEmpty(deleteBrandIds)) { - userBrandMapper.deleteByUserIdAndPostId(userId, deleteBrandIds); + if (!CollectionUtil.isEmpty(deleteBrandIds) || reqVO.getDeptId() != 1000000L) { + userBrandMapper.deleteByUserIdAndBrandId(userId, deleteBrandIds); } } diff --git a/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue index a07c9f5..dd9a451 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue @@ -82,7 +82,7 @@ - +