Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

This commit is contained in:
zhou-hongcheng
2026-04-16 11:31:26 +08:00
@@ -436,7 +436,7 @@ public class MenuApplicationService {
if (CollectionUtil.isNotEmpty(customAuthOrganizations)){
customAuthOrganizations.forEach(e->{
Map<String,String> map = new HashMap<>();
map.put("menuId",e.getMenuId().toString());
map.put("menuId",e.getMenuId() == null ? "" : e.getMenuId().toString());
map.put("tableJson",e.getTableJson());
map.put("formJson",e.getFormJson());
map.put("buttonJson",e.getButtonJson());
@@ -452,7 +452,7 @@ public class MenuApplicationService {
if (CollectionUtil.isNotEmpty(customAuthUserList)){
customAuthUserList.forEach(e->{
Map<String,String> map = new HashMap<>();
map.put("menuId",e.getMenuId().toString());
map.put("menuId",e.getMenuId() == null ? "" : e.getMenuId().toString());
map.put("tableJson",e.getTableJson());
map.put("formJson",e.getFormJson());
map.put("buttonJson",e.getButtonJson());