提交

src/main/java/cn/ezhizao/framework/security/service/SysLoginService.java

@@ -187,6 +187,9 @@ public class SysLoginService
             QueryWrapper<BizUserTenant> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("user_id", sysUser.getUserId());
             BizUserTenant userTenant = userTenantService.getOne(queryWrapper);
+            if (userTenant == null) {
+                return tenant=null;
+            }
             tenant = tenantService.getById(userTenant.getTenantId());
         }
         return tenant;

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

@@ -43,6 +43,7 @@ public class BizEntrustPriceController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(BizEntrustPrice bizEntrustPrice) throws NoSuchFieldException, IllegalAccessException {
         startPage();
+        bizEntrustPrice.setToTenantId(getTenantId());
         List<BizEntrustPrice> list = bizEntrustPriceService.getList(bizEntrustPrice);
         return getDataTable(list);
     }
@@ -99,7 +100,7 @@ public class BizEntrustPriceController extends BaseController {
     public AjaxResult add(@RequestBody BizEntrustPrice bizEntrustPrice) throws NoSuchFieldException, IllegalAccessException {
         //判读是否存在该价目
         setTenantId(bizEntrustPrice);
-        bizEntrustPrice.setToTenantId(bizEntrustPrice.getFromTenantId());
+        bizEntrustPrice.setToTenantId(getTenantId());
         List<BizEntrustPrice> list = bizEntrustPriceService.getList(bizEntrustPrice);
         if (list.size() > 0) {
             return AjaxResult.error("该价目已存在");

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

@@ -134,6 +134,9 @@ 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{

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

@@ -125,6 +125,9 @@ public class SysUserController extends BaseController
             QueryWrapper<BizUserTenant> userTenantQueryWrapper = new QueryWrapper<>();
             userTenantQueryWrapper.eq("user_id", sysUser.getUserId()).eq("tenant_id", sysUser.getTenantId());
             BizUserTenant tenant = userTenantService.getOne(userTenantQueryWrapper);
+            if(tenant==null){
+                return error("该用户企业信息异常，请联系管理员");
+            }
             ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin() && tenant.getTenantId().equals(r.getTenantId())).collect(Collectors.toList()));
             ajax.put("posts", postService.selectPostAll().stream().filter(p -> tenant.getTenantId().equals(p.getTenantId())).collect(Collectors.toList()));
         }else{