Merge pull request '修正租户id为Long问题' (#3) from school into master

Reviewed-on: #3

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();

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<String,Object> params){
         RespPage<ScCommissionPlans> page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize"));
-        service.page(page, Wrappers.<ScCommissionPlans>lambdaQuery()
+        RespPage<ScCommissionPlans> page1 = service.page(page, Wrappers.<ScCommissionPlans>lambdaQuery()
                 .eq(StrUtil.isNotEmpty((CharSequence) params.get("planName")),
-                        ScCommissionPlans::getPlanName,params.get("planName"))
+                        ScCommissionPlans::getPlanName, params.get("planName"))
-                .eq(ObjectUtil.isNotEmpty(params.get("isActive")),ScCommissionPlans::getIsActive,params.get("isActive"))
+                .eq(ObjectUtil.isNotEmpty(params.get("isActive")), ScCommissionPlans::getIsActive, params.get("isActive"))
         );
-        return AjaxResult.success();
+        return AjaxResult.success(page1);
     }
 
     @PostMapping("saveOrEdit")

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;
+
+}

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

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;
 
 }

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;
 }

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<SysRole> {
 
-    List<SysRole> selectUserRoleList(@Param("userId")Long userId, @Param("tenantId")Long tenantId);
+    List<SysRole> selectUserRoleList(@Param("userId")Long userId, @Param("tenantId")String tenantId);
 
     /**
      * 角色对应的菜单Id列表
@@ -25,5 +25,5 @@ public interface ISysRoleMapper extends BaseMapper<SysRole> {
      * @param tenantId
      * @return
      */
-    List<String> selectUserRoleTreeIdList(@Param("userId")Long userId, @Param("tenantId")Long tenantId);
+    List<String> selectUserRoleTreeIdList(@Param("userId")Long userId, @Param("tenantId")String tenantId);
 }

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/ISysRoleMenuService.java

@@ -24,6 +24,6 @@ public interface ISysRoleMenuService extends IService<SysRoleMenu> {
      * @return
      */
     @CacheEvict(value = "USER_PERMISSION_META", allEntries = true)
-    void updateRoleMenu(SysRole sysRole, Long nowTenantId);
+    void updateRoleMenu(SysRole sysRole, String nowTenantId);
 
 }

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<SysRole> {
 
-    List<SysRole> selectUserRoleList(Long userId, Long tenantId);
+    List<SysRole> selectUserRoleList(Long userId, String tenantId);
 
     /**
      * 是否存在子节点
@@ -43,7 +43,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param tenantId
      * @return
      */
-    List<String> selectUserRoleTreeIdList(Long userId, Long tenantId);
+    List<String> selectUserRoleTreeIdList(Long userId, String tenantId);
 
     /**
      * 根据编码 获取角色

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<ISysRoleMenuMapper, SysRoleMenu> 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());

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<ISysRoleMapper, SysRole> implements ISysRoleService {
 
     @Override
-    public List<SysRole> selectUserRoleList(Long userId, Long tenantId) {
+    public List<SysRole> selectUserRoleList(Long userId, String tenantId) {
         return baseMapper.selectUserRoleList(userId, tenantId);
     }
 
@@ -62,7 +62,7 @@ public class ISysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> im
     }
 
     @Override
-    public List<String> selectUserRoleTreeIdList(Long userId, Long tenantId) {
+    public List<String> selectUserRoleTreeIdList(Long userId, String tenantId) {
         return baseMapper.selectUserRoleTreeIdList(userId, tenantId);
     }
 

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);
 
 }

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<SysTagMapper, SysTag> 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);

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;
 
     /**
      * 企业名称

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);
 

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<Long> tenantThreadLocal = new ThreadLocal<>();
+    private static ThreadLocal<String> 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() {
+    public static final String getTenant() {
-        Long tenantId = tenantThreadLocal.get();
+        String tenantId = tenantThreadLocal.get();
         if (ObjectUtil.isEmpty(tenantId)) {
             return SecurityUtils.getLoginUser().getNowTenantId();
         }

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;
 
     /**
      * 权限列表