Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleGroupReq.java

@@ -18,12 +18,12 @@ public class QuerySaasRoleGroupReq {
 	/**
 	 * 项目部id(不传或者传-1查询的是标准分组)
 	 */
-	private Long workspaceId;
+	private List<Long> workspaceIds;
 
 	/**
 	 * 单位id(不传或者传-1查询的是标准分组)
 	 */
-	private Long ouId;
+	private List<Long> ouIds;
 
 	/**
 	 * 工作台类型字典code

tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java

@@ -11,9 +11,9 @@ import cn.axzo.tyr.client.model.vo.DeletePermissionGroupVO;
 import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO;
 import cn.axzo.tyr.client.model.vo.SaveOrUpdatePermissionGroupVO;
 import cn.axzo.tyr.client.model.vo.SavePermissionGroupPPVO;
-import cn.axzo.tyr.server.repository.service.SaasPermissionGroupDao;
+import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupDao;
-import cn.axzo.tyr.server.repository.service.SaasPermissionGroupScopeDao;
+import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupScopeDao;
-import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao;
 import cn.axzo.tyr.server.service.PermissionGroupService;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;

tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java

@@ -3,7 +3,6 @@ package cn.axzo.tyr.server.controller.roleuser;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.TyrSaasRoleUserApi;
 import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
-import cn.axzo.tyr.server.repository.service.SaasRoleUserRelationDao;
 import cn.axzo.tyr.server.service.SaasRoleUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java

@@ -2,7 +2,7 @@ package cn.axzo.tyr.server.job;
 
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.server.repository.entity.*;
-import cn.axzo.tyr.server.repository.service.*;
+import cn.axzo.tyr.server.repository.dao.*;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -76,12 +76,6 @@ public class OMSRoleJobHandler extends IJobHandler {
 		oldRole.forEach(e -> {
 			e.setWorkspaceId(-1l);
 			e.setOwnerOuId(-1l);
-			e.setFitOuTypeBit(-1);
-			e.setFitOuNodeTypeBit(-1);
-			e.setPositionTemplateId(-1l);
-			e.setProjectTeamManageRoleResourceId(-1l);
-			e.setFromPreRoleId(-1l);
-			e.setJobCode("");
 		});
 		roleDao.updateBatchById(oldRole);
 		// 保存角色分组关联关系

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/ProductModuleDao.java

@@ -1,9 +1,8 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.tyr.server.repository.entity.ProductModule;
 import cn.axzo.tyr.server.repository.mapper.ProductModuleMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 
 /**

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.tyr.server.repository.entity.SaasFeature;
 import com.baomidou.mybatisplus.extension.service.IService;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPermissionGroupScopeDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupPermissionRelationDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasPgroupRoleRelationDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasProductModuleFeatureRelationDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.tyr.server.repository.entity.SaasProductModuleFeatureRelation;
 import cn.axzo.tyr.server.repository.mapper.SaasProductModuleFeatureRelationMapper;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleDao.java

@@ -1,4 +1,4 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java

@@ -1,14 +1,10 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
-import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
-import cn.axzo.tyr.server.repository.entity.SaasRole;
 import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
-import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper;
 import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
@@ -38,6 +34,8 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
         LambdaQueryChainWrapper<SaasRoleGroup> eq = this.lambdaQuery()
             .in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId, req.getIds())
             .in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()), SaasRoleGroup::getWorkspaceTypeCode, req.getWorkspaceTypeCode())
+            .in(CollectionUtils.isNotEmpty(req.getWorkspaceIds()), SaasRoleGroup::getWorkspaceId, req.getWorkspaceIds())
+            .in(CollectionUtils.isNotEmpty(req.getOuIds()), SaasRoleGroup::getOuId, req.getOuIds())
             .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value);
         if(CollectionUtils.isNotEmpty(req.getOuTypeCode())){
             eq.last(" AND (" + condition.substring(0, condition.length() - 2) + ")");

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupRelationDao.java

@@ -1,11 +1,8 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
-import cn.axzo.tyr.server.repository.entity.SaasPgroupPermissionRelation;
-import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
 import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
-import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
 import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupRelationMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections.CollectionUtils;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java

@@ -1,17 +1,13 @@
-package cn.axzo.tyr.server.repository.service;
+package cn.axzo.tyr.server.repository.dao;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
-import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
 import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
 import cn.axzo.tyr.server.repository.mapper.SaasRoleUserRelationMapper;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/impl/SaasFeatureDaoImpl.java

@@ -1,12 +1,10 @@
-package cn.axzo.tyr.server.repository.service.impl;
+package cn.axzo.tyr.server.repository.dao.impl;
 
 import cn.axzo.tyr.server.repository.entity.SaasFeature;
 import cn.axzo.tyr.server.repository.mapper.SaasFeatureMapper;
-import cn.axzo.tyr.server.repository.service.SaasFeatureDao;
+import cn.axzo.tyr.server.repository.dao.SaasFeatureDao;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java

@@ -39,39 +39,14 @@ public class SaasRole extends BaseEntity<SaasRole> {
 
 	private Long workspaceId;
 
+	/**
+	 * 废弃
+	 */
+	@Deprecated
 	private Integer workspaceType;
 
 	private Long ownerOuId;
 
-	/**
-	 * 废弃 20230911
-	 */
-	private Integer fitOuTypeBit;
-
-	/**
-	 * 废弃 20230911
-	 */
-	private Integer fitOuNodeTypeBit;
-
-	/**
-	 * 废弃 20230911
-	 */
-	private Long positionTemplateId;
-
-	/**
-	 * 废弃 20230911
-	 */
-	private Long projectTeamManageRoleResourceId;
-
-	/**
-	 * 废弃 20230911
-	 */
-	private Long fromPreRoleId;
-
-	/**
-	 * 废弃 20230911
-	 */
-	private String jobCode;
 
 	/**
 	 * 创建者

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java

@@ -13,7 +13,7 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeNode;
 import cn.axzo.tyr.client.model.req.QuerySaasPermissionGroupReq;
 import cn.axzo.tyr.client.model.vo.*;
 import cn.axzo.tyr.server.repository.entity.*;
-import cn.axzo.tyr.server.repository.service.*;
+import cn.axzo.tyr.server.repository.dao.*;
 import cn.axzo.tyr.server.service.PermissionGroupService;
 import cn.axzo.tyr.server.service.PermissionPointService;
 import cn.axzo.tyr.server.service.SaasPermissionGroupScopeService;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java

@@ -18,8 +18,8 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeNode;
 import cn.axzo.tyr.client.model.permission.PermissionPointTreeQueryReq;
 import cn.axzo.tyr.client.model.permission.PermissionPointVO;
 import cn.axzo.tyr.server.repository.entity.SaasFeature;
-import cn.axzo.tyr.server.repository.service.SaasFeatureDao;
+import cn.axzo.tyr.server.repository.dao.SaasFeatureDao;
-import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao;
 import cn.axzo.tyr.server.service.PermissionPointService;
 import cn.axzo.tyr.server.service.SaasBasicDictService;
 import cn.hutool.core.collection.CollectionUtil;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java

@@ -6,7 +6,7 @@ import cn.axzo.tyr.client.model.product.ProductFeatureRelationSearchReq;
 import cn.axzo.tyr.client.model.product.ProductFeatureRelationUpdateReq;
 import cn.axzo.tyr.client.model.product.ProductFeatureRelationVO;
 import cn.axzo.tyr.server.repository.entity.SaasProductModuleFeatureRelation;
-import cn.axzo.tyr.server.repository.service.SaasProductModuleFeatureRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasProductModuleFeatureRelationDao;
 import cn.axzo.tyr.server.service.ProductFeatureRelationService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java

@@ -11,7 +11,7 @@ import cn.axzo.tyr.client.model.product.ProductSearchPageReq;
 import cn.axzo.tyr.client.model.product.ProductUpdateReq;
 import cn.axzo.tyr.client.model.product.ProductVO;
 import cn.axzo.tyr.server.repository.entity.ProductModule;
-import cn.axzo.tyr.server.repository.service.ProductModuleDao;
+import cn.axzo.tyr.server.repository.dao.ProductModuleDao;
 import cn.axzo.tyr.server.service.ProductService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java

@@ -14,7 +14,7 @@ import cn.axzo.tyr.client.model.vo.SaasPermissionGroupVO;
 import cn.axzo.tyr.client.model.vo.SaasRoleVO;
 import cn.axzo.tyr.client.model.vo.SaveOrUpdateRoleVO;
 import cn.axzo.tyr.server.repository.entity.*;
-import cn.axzo.tyr.server.repository.service.*;
+import cn.axzo.tyr.server.repository.dao.*;
 import cn.axzo.tyr.server.service.*;
 import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
@@ -225,7 +225,7 @@ public class RoleServiceImpl implements RoleService {
 		saasRole.setDescription(saasRole.getDescription());
 		saasRole.setRoleType(saveOrUpdateRole.getRoleType());
 		saasRole.setWorkspaceId(saveOrUpdateRole.getWorkspaceId());
-		saasRole.setWorkspaceType(saveOrUpdateRole.getWorkspaceType());
+//		saasRole.setWorkspaceType(saveOrUpdateRole.getWorkspaceType());
 		saasRole.setOwnerOuId(saveOrUpdateRole.getOwnerOuId());
 		saasRole.setUpdateBy(saveOrUpdateRole.getOperatorId());
 		saasRole.setUpdateAt(now);

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java

@@ -7,8 +7,8 @@ import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
 import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.server.repository.entity.SaasRole;
 import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
-import cn.axzo.tyr.server.repository.service.SaasRoleDao;
+import cn.axzo.tyr.server.repository.dao.SaasRoleDao;
-import cn.axzo.tyr.server.repository.service.SaasRoleUserRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao;
 import cn.axzo.tyr.server.service.SaasRoleUserService;
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.RequiredArgsConstructor;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPermissionGroupScopeServiceImpl.java

@@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.tyr.server.repository.entity.SaasPermissionGroupScope;
-import cn.axzo.tyr.server.repository.service.SaasPermissionGroupScopeDao;
+import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupScopeDao;
 import cn.axzo.tyr.server.service.SaasPermissionGroupScopeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationServiceImpl.java

@@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.tyr.server.repository.entity.SaasPgroupPermissionRelation;
-import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasPgroupPermissionRelationDao;
 import cn.axzo.tyr.server.service.SaasPgroupPermissionRelationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupRoleRelationServiceImpl.java

@@ -4,8 +4,8 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.tyr.client.model.enums.PermissionGroupType;
 import cn.axzo.tyr.server.repository.entity.SaasPermissionGroup;
 import cn.axzo.tyr.server.repository.entity.SaasPgroupRoleRelation;
-import cn.axzo.tyr.server.repository.service.SaasPermissionGroupDao;
+import cn.axzo.tyr.server.repository.dao.SaasPermissionGroupDao;
-import cn.axzo.tyr.server.repository.service.SaasPgroupRoleRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasPgroupRoleRelationDao;
 import cn.axzo.tyr.server.service.SaasPgroupRoleRelationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupRelationServiceImpl.java

@@ -2,7 +2,7 @@ package cn.axzo.tyr.server.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
-import cn.axzo.tyr.server.repository.service.SaasRoleGroupRelationDao;
+import cn.axzo.tyr.server.repository.dao.SaasRoleGroupRelationDao;
 import cn.axzo.tyr.server.service.SaasRoleGroupRelationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java

@@ -7,7 +7,7 @@ import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
 import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
 import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
 import cn.axzo.tyr.server.repository.entity.SaasRoleGroupRelation;
-import cn.axzo.tyr.server.repository.service.*;
+import cn.axzo.tyr.server.repository.dao.*;
 import cn.axzo.tyr.server.service.SaasRoleGroupService;
 import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;

tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java

@@ -10,7 +10,7 @@ import cn.axzo.tyr.client.model.permission.PermissionPointTreeQueryReq;
 import cn.axzo.tyr.client.model.permission.PermissionPointVO;
 import cn.axzo.tyr.server.controller.permission.PermissionPointController;
 import cn.axzo.tyr.server.repository.entity.SaasFeature;
-import cn.axzo.tyr.server.repository.service.SaasFeatureDao;
+import cn.axzo.tyr.server.repository.dao.SaasFeatureDao;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import org.junit.jupiter.api.Test;