更新

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java

@@ -137,11 +137,11 @@ public class InspectionFileController extends BaseController {
      */
     @PostMapping("/del/{id}")
     public CommonResult remove(@PathVariable Long id) throws Exception {
-        ShopMallPartners partners = partnerService.shopInfo();
+//        ShopMallPartners partners = partnerService.shopInfo();
-        InspectionFile file = inspectionFileService.selectInspectionFileById(id);
+//        InspectionFile file = inspectionFileService.selectInspectionFileById(id);
-        if (!partners.getPartnerId().equals(file.getPartnerId())) {
+//        if (!partners.getPartnerId().equals(file.getPartnerId())) {
-            return null;
+//            return null;
-        }
+//        }
         return toAjax(inspectionFileService.deleteInspectionFileById(id));
     }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.constant.InspectionConstants;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.inspection.entity.InspectionFile;
@@ -174,6 +176,9 @@ public class InspectionStaffServiceImpl extends ServiceImpl<InspectionStaffMappe
         //新增system_users主表
         UserSaveReqVO userDTO = BeanUtil.copyProperties(inspectionStaffVo, UserSaveReqVO.class);
         userDTO.setId(inspectionStaffVo.getUserId());
+        //获取当前人的租户id
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        userDTO.setTenantId(loginUser.getTenantId());
         Long userId = userService.createUser(userDTO);
 
 //        //查询检测基础员工角色

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/WarnMessageServiceImpl.java

@@ -57,8 +57,8 @@ public class WarnMessageServiceImpl extends ServiceImpl<WarnMessageMapper,WarnMe
 
     @Override
     public IPage<WarnMessage> pageList(Page page, WarnMessage warnMessage) throws Exception {
-        ShopMallPartners partners = partnerService.shopInfo();
+//        ShopMallPartners partners = partnerService.shopInfo();
-        warnMessage.setPartnerId(partners.getPartnerId());
+//        warnMessage.setPartnerId(partners.getPartnerId());
         warnMessage.setIsRead("0");
         IPage<WarnMessage> warnMessages = baseMapper.pageList(page,warnMessage);
         return warnMessages;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -514,7 +514,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 
     @Override
     public Map<String, Object> getTenant(AuthLoginReqVO reqVO) {
-        Map<String, Object> map = userService.queryUserIgnoreTenant(reqVO);
+        return userService.queryUserIgnoreTenant(reqVO);
-        return null;
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqV
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
@@ -134,7 +135,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, TenantDO> imple
             // 创建角色
             Long roleId = createRole(menuIds);
             // 创建租户管理员用户，并分配角色
-            Long userId = createUser(roleId, createReqVO);
+            Long userId = createUser(roleId, createReqVO, tenant.getId());
             // 修改租户的管理员
             tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId));
             //创建租户顶级部门
@@ -187,9 +188,11 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, TenantDO> imple
         return deptService.createDeptNoVerify(deptSaveReqVO);
     }
 
-    private Long createUser(Long roleId, TenantSaveReqVO createReqVO) {
+    private Long createUser(Long roleId, TenantSaveReqVO createReqVO, Long tenantId) {
         // 创建用户
-        Long userId = userService.createUser(TenantConvert.INSTANCE.convert02(createReqVO));
+        UserSaveReqVO userSaveReqVO = TenantConvert.INSTANCE.convert02(createReqVO);
+        userSaveReqVO.setTenantId(tenantId);
+        Long userId = userService.createUser(userSaveReqVO);
         // 分配角色
         permissionService.assignUserRole(userId, singleton(roleId));
         return userId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -659,8 +659,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
      */
     @Override
     public Map<String, Object> queryUserIgnoreTenant(AuthLoginReqVO reqVO) {
-        Map<String, Object> map = baseMapper.queryUserIgnoreTenant(reqVO);
+        return baseMapper.queryUserIgnoreTenant(reqVO);
-        return null;
     }
 
     /**

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -101,5 +101,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		role_id = #{roleId}
 		)
 	</select>
-    <select id="queryUserIgnoreTenant" resultType="java.util.Map"></select>
+    <select id="queryUserIgnoreTenant" resultType="java.util.Map">
+		SELECT *
+		FROM system_users
+		WHERE
+		username = #{username}
+		AND deleted = 0 AND tenant_id != 0
+		limit 1
+	</select>
 </mapper>

yudao-server/src/main/resources/application.yaml

@@ -13,8 +13,8 @@ spring:
   servlet:
     # 文件上传相关配置项
     multipart:
-      max-file-size: 16MB # 单个文件大小
+      max-file-size: 10240MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
+      max-request-size: 10240MB # 设置总上传的文件大小
 
   # Jackson 配置项
   jackson: