From b0a7a0d2bc7ac337984f500968bf1f382ca92f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 30 Oct 2025 09:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=A7=9F=E6=88=B7id=E4=B8=BA?= =?UTF-8?q?Long=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BusinessScCourseTypeService.java | 1 + .../ScCommissionPlansController.java | 8 ++--- .../sc/salary/repo/model/CommissionInfo.java | 30 +++++++++++++++++++ .../admin/domain/req/ReqUpdateUserRole.java | 2 +- .../business/sys/admin/model/SysUserDept.java | 2 +- .../sys/admin/model/SysUserTenant.java | 2 +- .../sys/admin/repo/mapper/ISysRoleMapper.java | 4 +-- .../admin/service/ISysRoleMenuService.java | 2 +- .../sys/admin/service/ISysRoleService.java | 4 +-- .../service/impl/ISysRoleMenuServiceImpl.java | 2 +- .../service/impl/ISysRoleServiceImpl.java | 4 +-- .../sys/tag/service/ISysTagService.java | 2 +- .../tag/service/impl/SysTagServiceImpl.java | 2 +- .../wechat/cp/repo/model/WechatCpAccount.java | 2 +- .../cp/service/WechatCpSyncService.java | 6 ++-- .../config/tenant/TenantContextHolder.java | 8 ++--- .../common/core/domain/model/LoginUser.java | 2 +- 17 files changed, 57 insertions(+), 26 deletions(-) create mode 100644 ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseTypeService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseTypeService.java index 4c27a46..e459958 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseTypeService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/service/BusinessScCourseTypeService.java @@ -86,6 +86,7 @@ public class BusinessScCourseTypeService { public APIResponse addScCourseType(ScCourseType scCourseType) { LoginUser loginUser = SecurityUtils.getLoginUser(); scCourseType.setCreateUser(loginUser.getUserId()); + scCourseType.setTenantId(loginUser.getNowTenantId()); boolean addScCourseType = scCourseTypeService.save(scCourseType); if (addScCourseType) { return APIResponse.toOkResponse(); diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java index 9fb62c0..2c77357 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java @@ -25,12 +25,12 @@ public class ScCommissionPlansController { @PostMapping("list") public AjaxResult list(@RequestBody Map params){ RespPage page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize")); - service.page(page, Wrappers.lambdaQuery() + RespPage page1 = service.page(page, Wrappers.lambdaQuery() .eq(StrUtil.isNotEmpty((CharSequence) params.get("planName")), - ScCommissionPlans::getPlanName,params.get("planName")) - .eq(ObjectUtil.isNotEmpty(params.get("isActive")),ScCommissionPlans::getIsActive,params.get("isActive")) + ScCommissionPlans::getPlanName, params.get("planName")) + .eq(ObjectUtil.isNotEmpty(params.get("isActive")), ScCommissionPlans::getIsActive, params.get("isActive")) ); - return AjaxResult.success(); + return AjaxResult.success(page1); } @PostMapping("saveOrEdit") diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java new file mode 100644 index 0000000..ff51844 --- /dev/null +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java @@ -0,0 +1,30 @@ +package cn.xluobo.business.sc.salary.repo.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; + +/** + * 销售和教室提成设置 + */ +@Getter +@Setter +@TableName("sc_commission_info") +public class CommissionInfo { + + @TableId(type = IdType.AUTO) + private Integer id; + + private Integer tenantId; + + private Long schoolId; + + private String schoolName; + + private Integer courseId; + + private Integer courseName; + +} diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/req/ReqUpdateUserRole.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/req/ReqUpdateUserRole.java index 778823e..801a7b6 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/req/ReqUpdateUserRole.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/domain/req/ReqUpdateUserRole.java @@ -14,7 +14,7 @@ public class ReqUpdateUserRole implements Serializable { private Long userId; - private Long tenantId; + private String tenantId; /** * 角色Id diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserDept.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserDept.java index 995f591..5d7dae3 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserDept.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserDept.java @@ -30,6 +30,6 @@ public class SysUserDept { * 租户 */ @TableField("tenant_id") - private Long tenantId; + private String tenantId; } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserTenant.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserTenant.java index f0e5094..a15f630 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserTenant.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/model/SysUserTenant.java @@ -19,5 +19,5 @@ public class SysUserTenant implements Serializable { private Long userId; @TableField("tenant_id") - private Long tenantId; + private String tenantId; } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapper/ISysRoleMapper.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapper/ISysRoleMapper.java index b9839a3..447478a 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapper/ISysRoleMapper.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapper/ISysRoleMapper.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface ISysRoleMapper extends BaseMapper { - List selectUserRoleList(@Param("userId")Long userId, @Param("tenantId")Long tenantId); + List selectUserRoleList(@Param("userId")Long userId, @Param("tenantId")String tenantId); /** * 角色对应的菜单Id列表 @@ -25,5 +25,5 @@ public interface ISysRoleMapper extends BaseMapper { * @param tenantId * @return */ - List selectUserRoleTreeIdList(@Param("userId")Long userId, @Param("tenantId")Long tenantId); + List selectUserRoleTreeIdList(@Param("userId")Long userId, @Param("tenantId")String tenantId); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleMenuService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleMenuService.java index 8735edd..a81c465 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleMenuService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleMenuService.java @@ -24,6 +24,6 @@ public interface ISysRoleMenuService extends IService { * @return */ @CacheEvict(value = "USER_PERMISSION_META", allEntries = true) - void updateRoleMenu(SysRole sysRole, Long nowTenantId); + void updateRoleMenu(SysRole sysRole, String nowTenantId); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleService.java index e9ba358..e2f2ff7 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleService.java @@ -15,7 +15,7 @@ import java.util.List; */ public interface ISysRoleService extends IService { - List selectUserRoleList(Long userId, Long tenantId); + List selectUserRoleList(Long userId, String tenantId); /** * 是否存在子节点 @@ -43,7 +43,7 @@ public interface ISysRoleService extends IService { * @param tenantId * @return */ - List selectUserRoleTreeIdList(Long userId, Long tenantId); + List selectUserRoleTreeIdList(Long userId, String tenantId); /** * 根据编码 获取角色 diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleMenuServiceImpl.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleMenuServiceImpl.java index ec14aba..f15136b 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleMenuServiceImpl.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleMenuServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; public class ISysRoleMenuServiceImpl extends ServiceImpl implements ISysRoleMenuService { @Override - public void updateRoleMenu(SysRole sysRole, Long nowTenantId) { + public void updateRoleMenu(SysRole sysRole, String nowTenantId) { //角色菜单关系 UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("role_id",sysRole.getRoleId()); diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleServiceImpl.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleServiceImpl.java index e7f7e8c..d719cde 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleServiceImpl.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/impl/ISysRoleServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; public class ISysRoleServiceImpl extends ServiceImpl implements ISysRoleService { @Override - public List selectUserRoleList(Long userId, Long tenantId) { + public List selectUserRoleList(Long userId, String tenantId) { return baseMapper.selectUserRoleList(userId, tenantId); } @@ -62,7 +62,7 @@ public class ISysRoleServiceImpl extends ServiceImpl im } @Override - public List selectUserRoleTreeIdList(Long userId, Long tenantId) { + public List selectUserRoleTreeIdList(Long userId, String tenantId) { return baseMapper.selectUserRoleTreeIdList(userId, tenantId); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/ISysTagService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/ISysTagService.java index 28b8cc9..5079b73 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/ISysTagService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/ISysTagService.java @@ -20,6 +20,6 @@ public interface ISysTagService extends com.baomidou.mybatisplus.extension.servi * @param tenantId * @param userId */ - void autoCreateTag(String[] tags, String tagType, Long tenantId, Long userId); + void autoCreateTag(String[] tags, String tagType, String tenantId, Long userId); } diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/impl/SysTagServiceImpl.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/impl/SysTagServiceImpl.java index a9cadec..318c5f3 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/impl/SysTagServiceImpl.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/tag/service/impl/SysTagServiceImpl.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; public class SysTagServiceImpl extends ServiceImpl implements ISysTagService { @Override - public void autoCreateTag(String[] tags, String tagType, Long tenantId, Long userId) { + public void autoCreateTag(String[] tags, String tagType, String tenantId, Long userId) { for (String tag : tags) { QueryWrapper qw = new QueryWrapper(); qw.eq("tenant_id", tenantId); diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java index e1c2d63..625b068 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java @@ -33,7 +33,7 @@ public class WechatCpAccount implements Serializable { * 所属租户 */ @TableField("tenant_id") - private Long tenantId; + private String tenantId; /** * 企业名称 diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/service/WechatCpSyncService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/service/WechatCpSyncService.java index 77e6055..7c2239d 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/service/WechatCpSyncService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/service/WechatCpSyncService.java @@ -66,7 +66,7 @@ public class WechatCpSyncService { * 内部应用同步联系人信息 */ @Async - public void syncSelfWechatCpContact(Long tenantId) { + public void syncSelfWechatCpContact(String tenantId) { try { TenantContextHolder.setTenant(tenantId); @@ -95,7 +95,7 @@ public class WechatCpSyncService { * 内部应用同步企业标签信息 */ @Async - public void syncSelfWechatCpTag(Long tenantId) { + public void syncSelfWechatCpTag(String tenantId) { try { TenantContextHolder.setTenant(tenantId); @@ -135,7 +135,7 @@ public class WechatCpSyncService { * @param tenantId */ @Async - public void syncSelfWechatCpUser(Long tenantId) { + public void syncSelfWechatCpUser(String tenantId) { try { TenantContextHolder.setTenant(tenantId); diff --git a/ruoyi-admin/src/main/java/cn/xluobo/config/tenant/TenantContextHolder.java b/ruoyi-admin/src/main/java/cn/xluobo/config/tenant/TenantContextHolder.java index ff75e4e..9012b1a 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/config/tenant/TenantContextHolder.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/config/tenant/TenantContextHolder.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; * 租户切换 */ public class TenantContextHolder { - private static ThreadLocal tenantThreadLocal = new ThreadLocal<>(); + private static ThreadLocal tenantThreadLocal = new ThreadLocal<>(); /** * 注意：手动调用代码切换租户，处理完毕需调用remove() @@ -16,12 +16,12 @@ public class TenantContextHolder { * 如不手动remove() , getTenant()时，有时候是从tenantThreadLocal取，有时候从用户中取。(因为处理线程不一致) * @param scheme */ - public static final void setTenant(Long scheme) { + public static final void setTenant(String scheme) { tenantThreadLocal.set(scheme); } - public static final Long getTenant() { - Long tenantId = tenantThreadLocal.get(); + public static final String getTenant() { + String tenantId = tenantThreadLocal.get(); if (ObjectUtil.isEmpty(tenantId)) { return SecurityUtils.getLoginUser().getNowTenantId(); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index d8d29b0..66a03a7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -66,7 +66,7 @@ public class LoginUser implements UserDetails @Getter @Setter - private Long nowTenantId; + private String nowTenantId; /** * 权限列表