提交

src/main/java/cn/ezhizao/project/business/reconciliation/priceList/controller/BizEntrustOncePriceController.java

@@ -57,7 +57,6 @@ public class BizEntrustOncePriceController extends BaseController {
         List<BizEntrustPrice> list = bizEntrustPriceService.getOnceList(bizEntrustPrice);
         List<BizEntrustOnce> onceList =new ArrayList<>();
         list.forEach(l -> {
-
             BizEntrustOnce once = new BizEntrustOnce();
             once.setRegion(l.getProvince() + "-" + l.getCity() + "-" + l.getDistrict());
             once.setTaskTypeName(l.getTaskTypeName());

src/main/java/cn/ezhizao/project/system/controller/SysLoginController.java

@@ -82,19 +82,6 @@ public class SysLoginController extends BaseController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-//        BizUserTenant condition = new BizUserTenant();
-//        condition.setUserId(user.getId());
-//
-//        List<BizUserTenant> userTenants = userTenantService.getList(condition);
-//        Tenant tenant = tenantService.query().in("id", userTenants.stream().map(BizUserTenant::getTenantId).collect(Collectors.toList())).one();
-//        SysVersion versions = versionService.getById(tenant.getVersionId());
-//        SysVersionMenu versionMenu = new SysVersionMenu();
-//        versionMenu.setVersionId(versions.getId());
-//        List<SysVersionMenu> menus = versionMenuService.getList(versionMenu);
-//        SysModule sysModule = new SysModule();
-//        sysModule.setIds(menus.stream().map(SysVersionMenu::getModuleId).distinct().collect(Collectors.toList()));
-//        List<SysModule> modules = moduleService.getList(sysModule);
-//        permissions = permissions.stream().anyMatch(v -> v.equals("*:*:*")) ? menus.stream().map(SysVersionMenu::getPerms).collect(Collectors.toSet()) : permissions.stream().filter(v -> menus.stream().anyMatch(e -> e.getPerms().equals(v))).collect(Collectors.toSet());
         Long tenantId =  getTenantId();
         Tenant tenant = tenantService.getById(tenantId);
         AjaxResult ajax = AjaxResult.success();
@@ -102,7 +89,6 @@ public class SysLoginController extends BaseController
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         ajax.put("tenant", tenant);
-//        ajax.put("modules", modules);
         return ajax;
     }
 
@@ -124,14 +110,6 @@ public class SysLoginController extends BaseController
         return AjaxResult.success(routers);
     }
 
-//    @GetMapping("getModules")
-//    public AjaxResult getModules() {
-//        Long tenantId = SecurityUtils.getTenantId();
-//        List<SysMenu> menus = menuService.selectMenuTreeByTenantId(tenantId);
-////        List<SysModule> sysModules = moduleService.
-//        return AjaxResult.success(menuService.buildMenus(menus));
-//    }
-
     /**
      * 根据用户名获取租户列表
      * @param userName
@@ -156,8 +134,8 @@ public class SysLoginController extends BaseController
     @GetMapping("/snms/getTenantId/{userName}")
     public AjaxResult getTenantId(@PathVariable("userName") String userName){
         Tenant tenant = loginService.getTenantByUserName(userName);
-        if(tenant==null ){
-            return error("未找到企业信息！请先注册并认证企业信息");
+        if(tenant.getId()==null ){
+            return error("用户不存在或密码错误！");
         }else{
             return success(tenant.getId());
         }