bug修改

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java

@@ -14,10 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -161,4 +158,11 @@ public class BaseMenuController {
     public Result<Map<String,Object>> getDefaultProjectMenu() {
         return Result.success(baseMenuService.getDefaultProjectMenu());
     }*/
+
+	@ApiOperation(value = "解决项目子账号的菜单按钮无法分配", notes = "解决项目子账号的菜单按钮无法分配", httpMethod="GET")
+	@GetMapping(value = "/fixAuthDistribute")
+	public Result fixAuthDistribute() {
+		baseMenuService.fixAuthDistribute();
+		return Result.ok();
+	}
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java

@@ -50,4 +50,7 @@ public interface IBaseMenuService extends IService<BaseMenu> {
     List<EntityMap> getSupplierMenuList(Map<String, Object> param);
 
     List<EntityMap> getSupplierActionList(Map<String, Object> param);
+
+    void fixAuthDistribute();
+
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java

@@ -2,8 +2,10 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.basicdata.entity.BaseAction;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
 import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig;
@@ -19,11 +21,12 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 系统菜单
@@ -34,6 +37,8 @@ import java.util.*;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> implements IBaseMenuService {
+    @Autowired
+    BaseActionServiceImpl baseActionService;
     @Autowired
     private BaseMenuMapper baseMenuMapper;
     @Autowired
@@ -67,6 +72,19 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
         return baseMenuMapper.getSupplierActionList(param);
     }
 
+    @Override
+    public void fixAuthDistribute() {
+        List<BaseMenu> baseMenus = baseMenuMapper.selectList(null);
+        for (BaseMenu baseMenu : baseMenus) {
+            editBaseMenu(baseMenu);
+        }
+
+        List<BaseAction> baseActions = baseActionMapper.selectList(null);
+        for (BaseAction baseAction : baseActions) {
+            baseActionService.editBaseAction(baseAction);
+        }
+    }
+
     @Override
     public Map<String, Object> getProjectModuleAndMenu(Map<String, Object> map) {
         map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn")));