Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java

@@ -21,6 +21,7 @@
import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.vo.RoleVO;
import lombok.AllArgsConstructor;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
@@ -59,15 +60,29 @@

   private final ICombinationService combinationService;

   private final IMdmCountConfigService mdmCountConfigService;

   @Override
   @GetMapping(MENU)
   public R<Menu> getMenu(Long id) {
      return R.data(menuService.getById(id));
   }

   /**
    * 根据code查询菜单信息
    * @param codes
    * @return
    */
   @Override
   @GetMapping(MENU_BY_CODES)
   public R<List<Menu>> getMenuByCodes(List<String> codes,Long userId) {
      return R.data(menuService.getMenuByCodes(codes,userId));
   }

   @Override
   @GetMapping(MENU_BUTTON)
   public R<List<Menu>> getMenuButtonByType(String btmType) {
      return R.data(menuService.getMenuButtonByType(btmType));
      return R.data(menuService.getMenuButtonByType(btmType, AuthUtil.getUserId()));
   }

   @Override
@@ -241,5 +256,10 @@
      return R.data(combinationService.getRegexList(combinationIds));
   }

   @Override
   @GetMapping(MDM_COUNT_CONFIG)
   public R<MdmCountConfig> getMdmCountConfig (String userId) {
      return R.data(mdmCountConfigService.getMdmCountConfig(userId));
   }

}