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 @@ - +