租户过滤的修改

commons/src/main/java/com/jzg/commons/config/MultiTenantHandler.java

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.properties.TenantProperties;
 import jodd.util.StringUtil;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.schema.Column;
 
 import java.util.List;
 
@@ -69,11 +70,6 @@ public class MultiTenantHandler implements TenantLineHandler {
             return true;
         }
 
-        // 平台默认忽略租户数据过滤
-        String system = controller.getUserLoginSystem();
-        if (SystemConstants.SYSTEM_PLATFORM.getCode().equals(system)) {
-            return true;
-        }
         // 可以自行增加一些校验比如获取不到用户就直接 return false 之类的。
         List<String> ignoreLoginNames = properties.getIgnoreLoginNames();
         // 忽略指定用户对租户的数据过滤
@@ -89,4 +85,14 @@ public class MultiTenantHandler implements TenantLineHandler {
         }
         return false;
     }
+
+    public boolean ignoreInsert(List<Column> columns, String tenantIdColumn) {
+        boolean isFlag = false;
+        for (Column column : columns) {
+            if(column.getColumnName().equals(tenantIdColumn)) {
+                isFlag = true;
+            }
+        }
+        return isFlag;
+    }
 }

commons/src/main/java/com/jzg/commons/entity/po/SysConfig.java

@@ -26,10 +26,6 @@ public class SysConfig {
     @Schema(description = "系统配置json")
     private String sysConfig;
 
-    /** 配置类型 0-初始化配置 1-权限配置 */
-    @Schema(description = "配置类型 0-初始化配置 1-权限配置")
-    private Integer type;
-
     /** 系统code */
     @Schema(description = "系统code")
     private String systemCode;

commons/src/main/java/com/jzg/commons/entity/po/SysUserPlateInfo.java

@@ -48,7 +48,6 @@ public class SysUserPlateInfo extends BaseModel {
      */
     public SysUserPlateInfo(String userId){
         this.userId = userId;
-        this.systemCode = SystemConstants.SYSTEM_PLATFORM.getCode();
         this.isEnable = YesNoEnum.YES.getCode();
     }
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysConfigVo.java

@@ -1,20 +0,0 @@
-package com.jzg.commons.entity.vo;
-
-import com.jzg.commons.entity.enums.ConfigTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@Schema(description = "系统配置实体")
-public class SysConfigVo {
-
-    @Schema(description = "系统code")
-    private String systemCode;
-
-    @Schema(description = "系统类型")
-    @NotEmpty(message = "系统类型不能为空")
-    private Integer type;
-}

commons/src/main/java/com/jzg/commons/entity/vo/SysRoleVo.java

@@ -22,10 +22,6 @@ public class SysRoleVo extends PageRequest {
     @Schema(description = "角色id")
     private String id;
 
-    @NotBlank(message = "系统code不能为空")
-    @Schema(description = "系统code")
-    private String system;
-
     @Schema(description = "机构id")
     private String deptId;
 
@@ -63,7 +59,6 @@ public class SysRoleVo extends PageRequest {
     public SysRole getSysRole(){
         SysRole sysRole = new SysRole();
         sysRole.setId(id);
-        sysRole.setSystemCode(system);
         sysRole.setDeptId(deptId);
         sysRole.setName(name);
         sysRole.setRemark(remark);
@@ -73,7 +68,6 @@ public class SysRoleVo extends PageRequest {
     public void setSysRole(SysRole sysRole){
         this.id = sysRole.getId();
         this.deptId = sysRole.getDeptId();
-        this.system = sysRole.getSystemCode();
         this.name = sysRole.getName();
         this.remark = sysRole.getRemark();
     }

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -7,7 +7,6 @@ import com.jzg.commons.entity.dto.SysSystemEditParam;
 import com.jzg.commons.entity.dto.SysSystemParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.SysConfig;
-import com.jzg.commons.entity.vo.SysConfigVo;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
@@ -41,10 +40,11 @@ public class SysSystemController {
      */
     @GetMapping("/getInitConfig")
     @Operation(summary = "获取平台初始化配置")
-    public HttpResult getInitConfig(SysConfigVo sysConfigVo){
-        return StringUtils.isNull(sysSystemService.getSystemConfig(sysConfigVo))?
+    public HttpResult getInitConfig(String systemCode){
+        SysConfig config = sysSystemService.getSystemConfig(systemCode);
+        return StringUtils.isNull(config)?
                 HttpResult.error("获取配置失败！")
-                : HttpResult.error("获取配置成功！");
+                : HttpResult.ok(config);
     }
 
     /**

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -7,8 +7,10 @@ import com.jzg.commons.entity.dto.SysUserAddParam;
 import com.jzg.commons.entity.dto.SysUserEditParam;
 import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
+import com.jzg.commons.entity.po.SysUserPlateInfo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.AssertionUtils;
+import com.jzg.mapper.SysUserPlateInfoMapper;
 import com.jzg.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,6 +33,9 @@ public class SysUserController extends BaseController {
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    private SysUserPlateInfoMapper sysUserPlateInfoMapper;
+
     /**
      * 平台用户列表
      * @param param
@@ -38,11 +43,13 @@ public class SysUserController extends BaseController {
      */
     @PostMapping("/userList")
     @Operation(summary = "平台用户列表")
-    public HttpResult sysList(@RequestBody SysUserParam param){
+    public HttpResult userList(@RequestBody SysUserParam param){
         Page page = param.getPage();
         return HttpResult.ok(sysUserService.queryPage(page,param));
     }
 
+
+
     /**
      * 平台用户信息查询
      * @param id

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -11,6 +11,7 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.service.UserRoleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import okhttp3.internal.platform.Platform;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +55,7 @@ public class UserRoleController extends BaseController {
             //从用户信息中获取租户code
             sysRoleVo.setSystemCode(getUserSystemCode());
         }
-        if(userRoleService.isExist(sysRoleVo.getSystem(),sysRoleVo.getName())){
+        if(userRoleService.isExist(sysRoleVo.getName())){
             throw new ValidateException("角色名称已存在,请修改后重新提交");
         }
         return userRoleService.roleAdd(sysRoleVo) ? HttpResult.ok("添加角色成功") : HttpResult.error("添加角色失败");
@@ -72,7 +73,7 @@ public class UserRoleController extends BaseController {
                 throw new ValidateException("请选择部门");
             }
         }
-        if(userRoleService.isExist(sysRoleVo.getSystem(),sysRoleVo.getName(),sysRoleVo.getId())){
+        if(userRoleService.isExist(sysRoleVo.getName(),sysRoleVo.getId())){
             throw new ValidateException("角色名称已存在,请修改后重新提交");
         }
         return userRoleService.roleUpdate(sysRoleVo)? HttpResult.ok("修改角色成功") : HttpResult.error("修改角色失败");

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -7,7 +7,6 @@ import com.jzg.commons.entity.dto.SysSystemEditParam;
 import com.jzg.commons.entity.dto.SysSystemParam;
 import com.jzg.commons.entity.po.SysConfig;
 import com.jzg.commons.entity.po.SysSystem;
-import com.jzg.commons.entity.vo.SysConfigVo;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
@@ -31,7 +30,7 @@ public interface SysSystemService extends IService<SysSystem> {
      * 获取初始化配置
      * @return
      */
-    public SysConfig getSystemConfig(SysConfigVo sysConfigVo);
+    public SysConfig getSystemConfig(String sysConfigVo);
 
     /**
      * 更新租户权限
@@ -42,10 +41,9 @@ public interface SysSystemService extends IService<SysSystem> {
     /**
      * 保存配置信息
      * @param configStr 配置json
-     * @param type 1.全部菜单
      * @param sysCode 系统code
      */
-    public void saveConfig(String configStr, Integer type, String sysCode);
+    public void saveConfig(String configStr, String sysCode);
 
     /**
      * 获取租户权限

platform/src/main/java/com/jzg/service/UserRoleService.java

@@ -27,16 +27,15 @@ public interface UserRoleService extends IService<SysRole> {
      * @param roleName
      * @return
      */
-    public boolean isExist(String systemCode,String roleName);
+    public boolean isExist(String roleName);
 
     /**
      * 根据角色名 判断角色是否存在 排除自身
-     * @param systemCode
      * @param roleName
      * @param id
      * @return
      */
-    public boolean isExist(String systemCode,String roleName,String id);
+    public boolean isExist(String roleName,String id);
 
     /**
      * 保存角色信息

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -12,7 +12,6 @@ import com.jzg.commons.entity.dto.SysSystemEditParam;
 import com.jzg.commons.entity.dto.SysSystemParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.*;
-import com.jzg.commons.entity.vo.SysConfigVo;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
@@ -66,7 +65,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     public boolean updatePerms(SysSystemPermsVo sysSystemPermsVo) {
         // 保存勾选菜单配置
         String permsStr = sysSystemPermsVo.getPermsStr();
-        this.saveConfig(permsStr, 1, sysSystemPermsVo.getSystemCode());
+        this.saveConfig(permsStr, sysSystemPermsVo.getSystemCode());
 
         // 获取租户管理员角色id
         LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
@@ -85,17 +84,15 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     /**
      * 保存配置信息
      * @param configStr 配置json
-     * @param type 1.全部菜单
      * @param sysCode 系统code
      */
-    public void saveConfig(String configStr, Integer type, String sysCode){
+    public void saveConfig(String configStr, String sysCode){
         List<SysConfig> checkConfigs = sysConfigMapper.selectList(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getType, type).eq(SysConfig::getSystemCode,sysCode));
+                .eq(SysConfig::getSystemCode,sysCode));
         SysConfig config;
         if(CollUtil.isEmpty(checkConfigs)){
             config = new SysConfig();
             config.setSysConfig(configStr);
-            config.setType(2);
             config.setSystemCode(sysCode);
             sysConfigMapper.insert(config);
         }else{
@@ -137,10 +134,8 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @Transactional(rollbackFor = Exception.class)
     public boolean updateConfig(SysConfig config) {
         List<SysConfig> configs = sysConfigMapper.selectList(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getType, 0)
                 .eq(SysConfig::getSystemCode, SystemConstants.SYSTEM_PLATFORM.getCode()));
         if(CollUtil.isEmpty(configs)){
-            config.setType(0);
             config.setSystemCode(SystemConstants.SYSTEM_PLATFORM.getCode());
             sysConfigMapper.insert(config);
         }else{
@@ -151,10 +146,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     }
 
     @Override
-    public SysConfig getSystemConfig(SysConfigVo sysConfigVo) {
+    public SysConfig getSystemConfig(String systemCode) {
         List<SysConfig> configs = sysConfigMapper.selectList(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getType, sysConfigVo.getType())
-                .eq(StringUtils.isNotEmpty(sysConfigVo.getSystemCode()),SysConfig::getSystemCode, sysConfigVo.getSystemCode()));
+                .eq(StringUtils.isNotEmpty(systemCode),SysConfig::getSystemCode, systemCode));
         if(CollUtil.isEmpty(configs)){
             return null;
         }
@@ -287,9 +281,8 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         // 初始化权限信息
         // 1.初始化配置的保存
         List<SysConfig> configs = sysConfigMapper.selectList(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getType, 0)
                 .eq(SysConfig::getSystemCode, SystemConstants.SYSTEM_PLATFORM.getCode()));
-        this.saveConfig(configs.get(0).getSysConfig(), 0, SystemConstants.SYSTEM_PLATFORM.getCode());
+        this.saveConfig(configs.get(0).getSysConfig(), SystemConstants.SYSTEM_PLATFORM.getCode());
 
         List<SysSystemPermsVo.PermsVo> permsList = JSON.parseArray(configs.get(0).getSysConfig(),SysSystemPermsVo.PermsVo.class);;
 
@@ -306,12 +299,11 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
      */
     public boolean savePerms(List<SysSystemPermsVo.PermsVo> permsList, String roleId){
         List<SysSystemPermsVo.PermsVo> all = new ArrayList<>();
-        for (SysSystemPermsVo.PermsVo permsVo : permsList) {
+        permsList.forEach(permsVo -> {
             List<SysSystemPermsVo.PermsVo> result = new ArrayList<>();
             this.recursionTreeToList(result, permsVo);
             all.addAll(result);
-        }
-
+        });
         List<SysRolePerms> perms = new ArrayList<>();
         all.forEach(per->{
             SysRolePerms sysSystemPerms = new SysRolePerms();

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -70,8 +70,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         SysUserVo vo = new SysUserVo();
         BeanUtils.copyProperties(user, vo);
         List<SysUserPlateInfo> infos = sysUserPlateInfoMapper.selectList(new LambdaQueryWrapper<SysUserPlateInfo>()
-                .eq(SysUserPlateInfo::getUserId, id)
-                .eq(SysUserPlateInfo::getSystemCode, SystemConstants.SYSTEM_PLATFORM.getCode()));
+                .eq(SysUserPlateInfo::getUserId, id));
         if(CollUtil.isNotEmpty(infos)){
             vo.setIsEnable(infos.get(0).getIsEnable());
         }
@@ -101,7 +100,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
             List<SysUserPlateInfo> infoList = sysUserPlateInfoMapper.selectList(infoLambdaQueryWrapper);
             if(CollUtil.isNotEmpty(infoList)){
                 List<SysUserPlateInfo> jzgInfos = infoList.stream().filter(info ->
-                        "PLATFORM".equals(info.getSystemCode())).collect(Collectors.toList());
+                        SystemConstants.SYSTEM_PLATFORM.getCode().equals(info.getSystemCode()))
+                        .collect(Collectors.toList());
                 if(CollUtil.isNotEmpty(jzgInfos)){
                     return true;
                 }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -85,17 +85,15 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
     }
 
     @Override
-    public boolean isExist(String systemCode,String roleName) {
+    public boolean isExist(String roleName) {
         return baseMapper.selectCount(new LambdaQueryWrapper<SysRole>()
-                .eq(SysRole::getName,roleName)
-                .eq(SysRole::getSystemCode,systemCode)) > 0;
+                .eq(SysRole::getName,roleName)) > 0;
     }
 
     @Override
-    public boolean isExist(String systemCode, String roleName, String id) {
+    public boolean isExist(String roleName, String id) {
         return baseMapper.selectCount(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getName,roleName)
-                .eq(SysRole::getSystemCode,systemCode)
                 .ne(SysRole::getId,id)) > 0;
     }
 
@@ -106,7 +104,6 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
         sysRoleVo.setId(IdGenerate.nextId());
         SysRole sysRole = sysRoleVo.getSysRole();
         List<SysRolePerms> sysRolePermsList = new ArrayList<>();
-        sysRole.setSystemCode(sysRoleVo.getSystem());
         sysRoleVo.getPerms().forEach(item->{
             SysRolePerms perms = new SysRolePerms();
             perms.setId(IdGenerate.nextId());
@@ -127,7 +124,6 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
     public boolean roleUpdate(SysRoleVo sysRoleVo) {
         SysRole sysRole = sysRoleVo.getSysRole();
         List<SysRolePerms> sysRolePermsList = new ArrayList<>();
-        sysRole.setSystemCode(sysRoleVo.getSystem());
         sysRoleVo.getPerms().forEach(item->{
             SysRolePerms perms = new SysRolePerms();
             perms.setId(IdGenerate.nextId());
@@ -174,8 +170,7 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
     @Override
     public boolean roleDelete(SysRoleVo sysRoleVo) {
         if(baseMapper.selectCount(new LambdaQueryWrapper<SysRole>()
-                .eq(SysRole::getId, sysRoleVo.getId())
-                .eq(SysRole::getSystemCode, sysRoleVo.getSystemCode())) == 0){
+                .eq(SysRole::getId, sysRoleVo.getId())) == 0){
             throw new SystemException("角色信息不存在");
         }
         if(sysRolePermsMapper.delete(new LambdaQueryWrapper<SysRolePerms>()
@@ -191,7 +186,6 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
             throw new SystemException("admin角色无法删除");
         }
         Long count = baseMapper.selectCount(new LambdaQueryWrapper<SysRole>()
-                .eq(SysRole::getSystemCode, sysRoleVo.getSystemCode())
                 .eq(SysRole::getId, sysRoleVo.getId())
         );
         if(count <= 0){

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -39,7 +39,7 @@
             <if test="param.searchValue != null and param.searchValue != ''">
                 and ( sr.username = #{param.searchValue} or sr.mobile = #{param.searchValue} or sr.id = #{param.searchValue})
             </if>
-            and si.system_code = 'PLATFORM' and sr.is_delete = 0
+             and sr.is_delete = 0
         </where>
         ORDER BY create_time DESC
     </select>