严智鑫
2024-10-12 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
@@ -1,10 +1,7 @@
package com.mes.md.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.engineering.entity.Engineering;
import com.mes.md.entity.*;
import com.mes.md.mapper.AccountMapper;
import com.mes.md.mapper.RoleMapper;
@@ -75,7 +72,6 @@
            accountRole.put("account",frist.get("account").toString());
            accountRole.put("role_id",frist.get("role_id").toString());
            for (Map<String,Object> item:username){
                if(keyMenus.contains(item.get("menu_id").toString())){
                    //存在此菜单
                    int index=keyMenus.indexOf(item.get("menu_id").toString());
@@ -93,8 +89,9 @@
                    thisMenu.put("pages",thisPages);
                    thisMenus.set(index,thisMenu);
                    accountRole.put("menus",thisMenus);
                }else if(keyMenus.size()>0){
                }else if(keyMenus.size()>0&&!keyMenus.contains(item.get("menu_id").toString())){
                    //不存在此菜单
                    keyMenus.add(item.get("menu_id").toString());
                    List<Map<String, Object>> thisMenus= (List<Map<String, Object>>) accountRole.get("menus");
                    Map<String, Object> thisMenu=new HashMap<>();
                    thisMenu.put("menu_id",item.get("menu_id"));
@@ -158,6 +155,7 @@
     */
    @Override
    public int addAccount(Account account){
        return baseMapper.insert(account);
    }
    /**