Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierCategoryController.java

@@ -46,6 +46,7 @@ public class BizCarrierCategoryController extends BaseController {
         queryWrapper.eq("parent_id", zero);
         if (tenantId != null && !zero.toString().equals(tenantId)) {
             queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
+
         }
         List<BizCarrierCategory> list = iBizCarrierCategoryService.list(queryWrapper);
         iBizCarrierCategoryService.getChildren(list);

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

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

@@ -14,8 +14,6 @@ import cn.ezhizao.project.system.domain.SysDeptUser;
 import cn.ezhizao.project.system.domain.SysRole;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.*;
-import cn.ezhizao.project.tenant.domain.BizUserTenant;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,8 +65,8 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) throws NoSuchFieldException, IllegalAccessException {
-        String tenantId = request.getHeader("tenantId");
-        user.setTenantId(Long.valueOf(tenantId));
+//        String tenantId = request.getHeader("tenantId");
+//        user.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);