bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-07-18 17:07:04 +08:00
parent b1fb3f1773
commit e2fd903141
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java
View File

@ -148,7 +148,6 @@ public class TypeRepairController extends BaseController
*/ */
@ApiOperation(value = "新增人员配置") @ApiOperation(value = "新增人员配置")
@PreventRepeatSubmit @PreventRepeatSubmit
@RequiresPermissions("ma:manage:add")
@SysLog(title = "新增人员配置", businessType = OperaType.INSERT, module = "仓储管理->新增人员配置") @SysLog(title = "新增人员配置", businessType = OperaType.INSERT, module = "仓储管理->新增人员配置")
@PostMapping("/addTypeManage") @PostMapping("/addTypeManage")
public AjaxResult addTypeManage(@RequestBody List<TypeRepair> typeRepairs) public AjaxResult addTypeManage(@RequestBody List<TypeRepair> typeRepairs)
@ -160,7 +159,6 @@ public class TypeRepairController extends BaseController
* 查询人员配置列表 * 查询人员配置列表
*/ */
@ApiOperation(value = "查询人员配置列表") @ApiOperation(value = "查询人员配置列表")
@RequiresPermissions("ma:manage:list")
@GetMapping("/getTypeManageList") @GetMapping("/getTypeManageList")
public TableDataInfo getTypeManageList(MaTypeVo maTypeVo) public TableDataInfo getTypeManageList(MaTypeVo maTypeVo)
{ {
@ -174,7 +172,6 @@ public class TypeRepairController extends BaseController
*/ */
@ApiOperation(value = "删除单个维修班机具配置") @ApiOperation(value = "删除单个维修班机具配置")
@PreventRepeatSubmit @PreventRepeatSubmit
@RequiresPermissions("ma:manage:remove")
@SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, module = "仓储管理->删除单个维修班机具配置") @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, module = "仓储管理->删除单个维修班机具配置")
@PostMapping("/unbindTypeManage") @PostMapping("/unbindTypeManage")
public AjaxResult unbindTypeManage(@RequestBody List<TypeRepair> typeRepairs) public AjaxResult unbindTypeManage(@RequestBody List<TypeRepair> typeRepairs)

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -167,7 +167,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
List<KeyValueVO> keyValueList = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); List<KeyValueVO> keyValueList = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds);
// 设置 itemType // 设置 itemType
if (CollectionUtil.isNotEmpty(keyValueList)) { if (CollectionUtil.isNotEmpty(keyValueList)) {
Map<String, String> keyValueMap = keyValueList.stream().collect(Collectors.toMap(KeyValueVO::getMapKey, KeyValueVO::getMapValue)); Map<String, String> keyValueMap = keyValueList.stream()
.filter(vo -> vo.getMapKey() != null && vo.getMapValue() != null) // 过滤键或值为 null 的元素
.collect(Collectors.toMap(KeyValueVO::getMapKey, KeyValueVO::getMapValue));
for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) {
Long taskId = scrapApplyDetailsVO.getTaskId(); Long taskId = scrapApplyDetailsVO.getTaskId();
if (taskId != null) { if (taskId != null) {