yinruoxi

修改：
    1.菜单逻辑修改

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/manager/impl/DmModelManager.java

@@ -375,7 +375,7 @@ public class DmModelManager extends BaseManagerImpl<DmModelQuery, DmModelDto, Dm
             } else {
                 List<DmH5MenuDto> childMenuDtos = item.getChildren();
                 for (DmH5MenuDto childMenuDto : childMenuDtos) {
-                    List<DmMenuIconPo> screenIconPos = dmMenuIconMapper.selectMenuIconListByMenuId(item.getId());
+                    List<DmMenuIconPo> screenIconPos = dmMenuIconMapper.selectMenuIconListByMenuId(childMenuDto.getId());
 
                     if (screenIconPos != null && screenIconPos.size() > 0) {
                         List<Long> u1 = screenIconPos.stream().map(DmMenuIconPo::getIconId).collect(Collectors.toList());
@@ -388,9 +388,9 @@ public class DmModelManager extends BaseManagerImpl<DmModelQuery, DmModelDto, Dm
 
                     }
                     log.info("主界面icon列表：{}",screenIconPos);
-                    if(item.getDmScreenIconDto() != null && item.getDmScreenIconDto().size() > 0) {
-                        log.info("当前菜单：{},包含icon列表：{}",item.getTitle(),item.getDmScreenIconDto());
-                        for (DmScreenIconDto screenIconDto : item.getDmScreenIconDto()) {
+                    if(childMenuDto.getDmScreenIconDto() != null && childMenuDto.getDmScreenIconDto().size() > 0) {
+                        log.info("当前菜单：{},包含icon列表：{}",childMenuDto.getTitle(),childMenuDto.getDmScreenIconDto());
+                        for (DmScreenIconDto screenIconDto : childMenuDto.getDmScreenIconDto()) {
                             DmScreenIconPo screenIconPo = new DmScreenIconPo();
                             if (screenIconDto.getId() != null && screenIconDto.getId().doubleValue() > 0) {
                                 // 更新模型-主界面icon关系
@@ -413,7 +413,7 @@ public class DmModelManager extends BaseManagerImpl<DmModelQuery, DmModelDto, Dm
                             }
                             // 新增模型-主界面icon关系
                             DmMenuIconPo iconPo = new DmMenuIconPo();
-                            iconPo.setMenuId(item.getId());
+                            iconPo.setMenuId(childMenuDto.getId());
                             iconPo.setIconId(screenIconPo.getId());
                             iconPo.setPos(screenIconDto.getPos());
                             dmMenuIconMapper.insertMerge(iconPo);