BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bb25f0712b660a9e7d9af5635fb463655431491c

Authored by puhui999
2 parents c573585e bf707077

Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop

Inline Side-by-side
Showing 14 changed files with 20 additions and 15 deletions
yudao-dependencies/pom.xml
  View file @bb25f07
... ... @@ -31,7 +31,7 @@
31 31 <redisson.version>3.26.0</redisson.version>
32 32 <dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
33 33 <!-- 消息队列 -->
34   - <rocketmq-spring.version>2.2.3</rocketmq-spring.version>
  34 + <rocketmq-spring.version>2.3.0</rocketmq-spring.version>
35 35 <!-- 服务保障相关 -->
36 36 <lock4j.version>2.2.7</lock4j.version>
37 37 <resilience4j.version>2.1.0</resilience4j.version>
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
  View file @bb25f07
... ... @@ -120,7 +120,7 @@ public class CrmClueServiceImpl implements CrmClueService {
120 120 }
121 121  
122 122 @Override
123   - @LogRecord(type = CRM_CLUE_TYPE, subType = CRM_CLUE_FOLLOW_UP_SUB_TYPE, bizNo = "{{#id}",
  123 + @LogRecord(type = CRM_CLUE_TYPE, subType = CRM_CLUE_FOLLOW_UP_SUB_TYPE, bizNo = "{{#id}}",
124 124 success = CRM_CLUE_FOLLOW_UP_SUCCESS)
125 125 @CrmPermission(bizType = CrmBizTypeEnum.CRM_CLUE, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
126 126 public void updateClueFollowUp(Long id, LocalDateTime contactNextTime, String contactLastContent) {
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java
  View file @bb25f07
... ... @@ -113,7 +113,7 @@ public class ProductCommentServiceImpl implements ProductCommentService {
113 113  
114 114 // 更新可见状态
115 115 productCommentMapper.updateById(new ProductCommentDO().setId(updateReqVO.getId())
116   - .setVisible(true));
  116 + .setVisible(updateReqVO.getVisible()));
117 117 }
118 118  
119 119 @Override
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
  View file @bb25f07
... ... @@ -18,7 +18,7 @@ public class DeptRespVO {
18 18 @Schema(description = "父部门 ID", example = "1024")
19 19 private Long parentId;
20 20  
21   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  21 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
22 22 private Integer sort;
23 23  
24 24 @Schema(description = "负责人的用户编号", example = "2048")
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
  View file @bb25f07
... ... @@ -25,7 +25,7 @@ public class DeptSaveReqVO {
25 25 @Schema(description = "父部门 ID", example = "1024")
26 26 private Long parentId;
27 27  
28   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  28 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
29 29 @NotNull(message = "显示顺序不能为空")
30 30 private Integer sort;
31 31  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java
  View file @bb25f07
... ... @@ -27,7 +27,7 @@ public class PostRespVO {
27 27 @ExcelProperty("岗位编码")
28 28 private String code;
29 29  
30   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  30 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
31 31 @ExcelProperty("岗位排序")
32 32 private Integer sort;
33 33  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
  View file @bb25f07
... ... @@ -26,7 +26,7 @@ public class PostSaveReqVO {
26 26 @Size(max = 64, message = "岗位编码长度不能超过64个字符")
27 27 private String code;
28 28  
29   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  29 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
30 30 @NotNull(message = "显示顺序不能为空")
31 31 private Integer sort;
32 32  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataRespVO.java
  View file @bb25f07
... ... @@ -19,7 +19,7 @@ public class DictDataRespVO {
19 19 @ExcelProperty("字典编码")
20 20 private Long id;
21 21  
22   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  22 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
23 23 @ExcelProperty("字典排序")
24 24 private Integer sort;
25 25  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
  View file @bb25f07
... ... @@ -16,7 +16,7 @@ public class DictDataSaveReqVO {
16 16 @Schema(description = "字典数据编号", example = "1024")
17 17 private Long id;
18 18  
19   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  19 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
20 20 @NotNull(message = "显示顺序不能为空")
21 21 private Integer sort;
22 22  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
  View file @bb25f07
... ... @@ -28,7 +28,7 @@ public class MenuRespVO {
28 28 @NotNull(message = "菜单类型不能为空")
29 29 private Integer type;
30 30  
31   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  31 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
32 32 @NotNull(message = "显示顺序不能为空")
33 33 private Integer sort;
34 34  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java
  View file @bb25f07
... ... @@ -27,7 +27,7 @@ public class MenuSaveVO {
27 27 @NotNull(message = "菜单类型不能为空")
28 28 private Integer type;
29 29  
30   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  30 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
31 31 @NotNull(message = "显示顺序不能为空")
32 32 private Integer sort;
33 33  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
  View file @bb25f07
... ... @@ -30,7 +30,7 @@ public class RoleRespVO {
30 30 @ExcelProperty("角色标志")
31 31 private String code;
32 32  
33   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  33 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
34 34 @ExcelProperty("角色排序")
35 35 private Integer sort;
36 36  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
  View file @bb25f07
... ... @@ -27,7 +27,7 @@ public class RoleSaveReqVO {
27 27 @DiffLogField(name = "角色标志")
28 28 private String code;
29 29  
30   - @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  30 + @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
31 31 @NotNull(message = "显示顺序不能为空")
32 32 @DiffLogField(name = "显示顺序")
33 33 private Integer sort;
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
  View file @bb25f07
... ... @@ -2,14 +2,16 @@ package cn.iocoder.yudao.module.system.service.permission;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
5   -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
6 5 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
  6 +import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
7 7 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
8 8 import cn.iocoder.yudao.module.system.dal.mysql.permission.MenuMapper;
9 9 import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
10 10 import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum;
11 11 import cn.iocoder.yudao.module.system.service.tenant.TenantService;
12 12 import com.google.common.annotations.VisibleForTesting;
  13 +import com.google.common.collect.Lists;
  14 +import jakarta.annotation.Resource;
13 15 import lombok.extern.slf4j.Slf4j;
14 16 import org.springframework.cache.annotation.CacheEvict;
15 17 import org.springframework.cache.annotation.Cacheable;
... ... @@ -17,7 +19,6 @@ import org.springframework.context.annotation.Lazy;
17 19 import org.springframework.stereotype.Service;
18 20 import org.springframework.transaction.annotation.Transactional;
19 21  
20   -import jakarta.annotation.Resource;
21 22 import java.util.Collection;
22 23 import java.util.List;
23 24  
... ... @@ -130,6 +131,10 @@ public class MenuServiceImpl implements MenuService {
130 131  
131 132 @Override
132 133 public List<MenuDO> getMenuList(Collection<Long> ids) {
  134 + // 当 ids 为空时，返回一个空的实例对象
  135 + if (CollUtil.isEmpty(ids)) {
  136 + return Lists.newArrayList();
  137 + }
133 138 return menuMapper.selectBatchIds(ids);
134 139 }
135 140  
... ...