修改bug

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDeptDataImpl.java

@@ -61,6 +61,7 @@ public class SysDeptDataImpl implements ISysDeptData, IJPACommData<SysDept, Long
                 .and(ObjectUtil.isNotNull(dept.getId()), () -> tbSysDept.id.eq(dept.getId()))
                 .and(ObjectUtil.isNotNull(dept.getParentId()), () -> tbSysDept.parentId.eq(dept.getParentId()))
                 .and(StringUtils.isNotEmpty(dept.getDeptName()), () -> tbSysDept.deptName.like(dept.getDeptName()))
+                .and(StringUtils.isNotEmpty(dept.getTenantId()), () -> tbSysDept.tenantId.like(dept.getTenantId()))
                 .and(StringUtils.isNotEmpty(dept.getStatus()), () -> tbSysDept.status.eq(dept.getStatus()));
         return MapstructUtils.convert(StreamSupport.stream(deptRepository.findAll(predicateBuilder.build()).spliterator(), false).collect(Collectors.toList()), SysDept.class);
     }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -323,6 +323,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
                 .and(StringUtils.isNotEmpty(user.getUserName()), () -> tbSysUser.userName.like("%" + user.getUserName() + "%"))
                 .and(StringUtils.isNotEmpty(user.getStatus()), () -> tbSysUser.status.eq(user.getStatus()))
                 .and(StringUtils.isNotEmpty(user.getPhonenumber()), () -> tbSysUser.phonenumber.like("%" + user.getPhonenumber() + "%"))
+                .and(StringUtils.isNotEmpty(user.getTenantId()),()->tbSysUser.tenantId.eq(user.getTenantId()))
                 .and(ObjectUtil.isNotEmpty(ids), () -> tbSysUser.deptId.in(ids)).build();
     }
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java

@@ -5,6 +5,7 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.constant.UserConstants;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
 import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.system.dto.bo.SysDeptBo;
@@ -42,6 +43,7 @@ public class SysDeptController extends BaseController {
     @ApiOperation("获取部门列表")
     @PostMapping("/list")
     public List<SysDeptVo> list(@RequestBody @Validated PageRequest<SysDeptBo> dept) {
+        dept.getData().setTenantId(TenantHelper.getTenantId());
         return deptService.selectDeptList(dept.getData());
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.model.system.SysUserRole;
 import cc.iotkit.system.dto.bo.SysDeptBo;
@@ -52,6 +53,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:list")
     @PostMapping("/list")
     public Paging<SysRoleVo> list(@RequestBody @Validated PageRequest<SysRoleBo> query) {
+        query.getData().setTenantId(TenantHelper.getTenantId());
         return roleService.selectPageRoleList(query);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java

@@ -16,6 +16,7 @@ import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
+import cc.iotkit.model.system.SysDept;
 import cc.iotkit.system.dto.bo.SysDeptBo;
 import cc.iotkit.system.dto.bo.SysUserBo;
 import cc.iotkit.system.dto.bo.SysUserRolesBo;
@@ -37,6 +38,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -60,7 +64,14 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:list")
     @PostMapping("/list")
     public Paging<SysUserVo> list(@RequestBody @Validated(QueryGroup.class) PageRequest<SysUserBo> query) {
-        return userService.selectPageUserList(query);
+        query.getData().setTenantId(TenantHelper.getTenantId());
+        Paging<SysUserVo> page = userService.selectPageUserList(query);
+        List<SysUserVo> sysUserVos = page.getRows();
+        Set<Long> deptIds = sysUserVos.stream().map(SysUserVo::getDeptId).collect(Collectors.toSet());
+        List<SysDeptVo> sysDeptVos =  deptService.selectDeptByIds(new ArrayList<>(deptIds));
+        Map<Long,SysDeptVo> sysDeptNameMap = sysDeptVos.stream().collect(Collectors.toMap(SysDeptVo::getId,o->o));
+        sysUserVos.forEach(item->item.setDept(sysDeptNameMap.get(item.getDeptId())));
+        return page;
     }
 
     @ApiOperation("导出用户列表")
@@ -270,6 +281,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:list")
     @PostMapping("/deptTree")
     public List<Tree<Long>> deptTree(@RequestBody @Validated(QueryGroup.class) Request<SysDeptBo> reqDept) {
+        reqDept.getData().setTenantId(TenantHelper.getTenantId());
         return deptService.selectDeptTreeList(reqDept.getData());
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDeptBo.java

@@ -34,6 +34,8 @@ public class SysDeptBo extends BaseDto {
      */
     private Long parentId;
 
+
+
     /**
      * 部门名称
      */
@@ -70,4 +72,9 @@ public class SysDeptBo extends BaseDto {
      */
     private String status;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java

@@ -94,4 +94,10 @@ public class SysRoleBo extends BaseDto {
         return UserConstants.SUPER_ADMIN_ID.equals(this.id);
     }
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java

@@ -39,6 +39,11 @@ public class SysUserBo extends BaseDto {
      */
     private Long deptId;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 用户账号
      */

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysUserVo.java

@@ -36,6 +36,11 @@ public class SysUserVo implements Serializable {
      */
     private Long deptId;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
     /**
      * 用户账号
      */

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDeptService.java

@@ -112,4 +112,6 @@ public interface ISysDeptService {
      * @param deptId 部门ID
      */
     void deleteDeptById(Long deptId);
+
+    List<SysDeptVo> selectDeptByIds(List<Long> ids);
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java

@@ -16,6 +16,7 @@ import cc.iotkit.system.dto.bo.SysDeptBo;
 import cc.iotkit.system.dto.vo.SysDeptVo;
 import cc.iotkit.system.service.ISysDeptService;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
@@ -23,6 +24,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -296,4 +298,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
         sysDeptData.deleteById(deptId);
     }
 
+    @Override
+    public List<SysDeptVo> selectDeptByIds(List<Long> ids) {
+        List<SysDept> sysDepts =  sysDeptData.findByIds(ids);
+        if(CollectionUtil.isEmpty(sysDepts)){
+            return Collections.emptyList();
+        }
+        return MapstructUtils.convert(sysDepts, SysDeptVo.class);
+    }
 }