submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -73,7 +73,7 @@ public class SysTenantController extends BaseController {
     @ApiOperation("获取系统商户详细信息")
     @PreAuthorize("@ss.hasPermi('system:tenant:query')")
     @GetMapping("/{tenantId}")
-    public AjaxResult<SysTenantVo> getInfo(@PathVariable("tenantId" ) Long tenantId) {
+    public AjaxResult<SysTenantVo> getInfo(@PathVariable("tenantId" ) String tenantId) {
         return AjaxResult.success(iSysTenantService.queryById(tenantId));
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -531,14 +531,14 @@ public class CommonController extends BaseController {
 
     @ApiOperation("同步其他机构角色菜单")
     @PostMapping("common/update/role")
-    public AjaxResult updateRoleTenant(@RequestBody List<Long> tenantIds) {
+    public AjaxResult updateRoleTenant(@RequestBody List<String> tenantIds) {
         iSysTenantService.updateRoleTenant(tenantIds);
         return AjaxResult.success();
     }
 
     @ApiOperation("同步其他机构字典")
     @PostMapping("common/update/dict")
-    public AjaxResult updateDictTenant(@RequestBody List<Long> tenantIds) {
+    public AjaxResult updateDictTenant(@RequestBody List<String> tenantIds) {
         iSysTenantService.updateDictTenant(tenantIds);
         return AjaxResult.success();
     }
@@ -631,7 +631,7 @@ public class CommonController extends BaseController {
     @ApiOperation("获取企业ID")
     @GetMapping("common/free/findTenantId")
     public AjaxResult<String> findTenantId(SysTenantQueryBo bo) {
-        Long tenantId = iSysTenantService.findTenantId(bo);
+        String tenantId = iSysTenantService.findTenantId(bo);
         if (Validator.isNotEmpty(tenantId)) {
             return AjaxResult.success("成功", tenantId.toString());
         } else {

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysLoginController.java

@@ -111,7 +111,7 @@ public class SysLoginController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysTenantVo sysTenantVo = iSysTenantService.queryById(Long.parseLong(tenantId));
+        SysTenantVo sysTenantVo = iSysTenantService.queryById(tenantId);
         Map<String,Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roles", roles);

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -312,7 +312,7 @@ public class CommonController extends BaseController {
     @ApiOperation("获取企业ID")
     @GetMapping("/findTenantId")
     public AjaxResult<String> findTenantId(SysTenantQueryBo bo) {
-        Long tenantId = iSysTenantService.findTenantId(bo);
+        String tenantId = iSysTenantService.findTenantId(bo);
         if(Validator.isNotEmpty(tenantId)){
             return AjaxResult.success("成功",tenantId.toString());
         }else{

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -125,7 +125,7 @@ public class UserController extends BaseController {
         vo.setNull();
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         if (StringUtils.isNotBlank(tenantId)){
-            SysTenant tenant = sysTenantService.getById(Long.valueOf(tenantId));
+            SysTenant tenant = sysTenantService.getById(tenantId);
             vo.setEduPhone(tenant.getEduPhone());
         }
 

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDictType.java

@@ -83,7 +83,7 @@ public class SysDictType implements Serializable
     private Map<String, Object> params = new HashMap<>();
 
     @TableField(value = "tenant_id")
-    private Long tenantId;
+    private String tenantId;
 
     /** 分页大小 */
     @ApiModelProperty("分页大小")

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysMenu.java

@@ -114,7 +114,7 @@ public class SysMenu implements Serializable
 
     /** 备注 */
 //    @TableField(exist = false)
-    private Long tenantId;
+    private String tenantId;
 
     /** 请求参数 */
     @TableField(exist = false)

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysUser.java

@@ -160,7 +160,7 @@ public class SysUser implements Serializable
     @TableField(exist = false)
     private String roleName;
 
-    private Long tenantId;
+    private String tenantId;
 
     /** 上一次登录IP */
     private String preLoginIp;

zhongzheng-framework/src/main/java/com/zhongzheng/framework/aspectj/LogAspect.java

@@ -152,7 +152,7 @@ public class LogAspect
             operLog.setMethod(className + "." + methodName + "()");
             String TenantId = ServletUtils.getRequest().getHeader("TenantId");
             if(Validator.isNotEmpty(TenantId)){
-                operLog.setTenantId(Long.parseLong(TenantId));
+                operLog.setTenantId(TenantId);
             }
             // 设置请求方式
             operLog.setRequestMethod(ServletUtils.getRequest().getMethod());

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysLoginService.java

@@ -264,14 +264,14 @@ public class SysLoginService
         seller.setStatus(1);
         seller.setCreateTime(DateUtils.getNowTime());
         seller.setUpdateTime(DateUtils.getNowTime());
-        seller.setTenantId(Long.valueOf(bo.getTenantId()));
+        seller.setTenantId(bo.getTenantId());
         seller.setShareCode(ToolsUtils.getRandomString(8));
         seller.setUserAccount(ServletUtils.getEncoded("YW"));
         seller.setParentId(0L);
         seller.setRegisterFrom(2);
         iDistributionSellerService.save(seller);
         //用户
-        sysUser.setTenantId(Long.valueOf(bo.getTenantId()));
+        sysUser.setTenantId(bo.getTenantId());
         sysUser.setUserName(bo.getAccount());
         sysUser.setNickName(bo.getAccount());
         sysUser.setSex("0");
@@ -297,12 +297,12 @@ public class SysLoginService
         SysUserRole sysUserRole = new SysUserRole();
         sysUserRole.setUserId(userId);
         sysUserRole.setRoleId(role.getRoleId());
-        sysUserRole.setTenantId(Long.valueOf(tenantId));
+        sysUserRole.setTenantId(tenantId);
 
         SysUserRole sysUserRole1 = new SysUserRole();
         sysUserRole1.setUserId(userId);
         sysUserRole1.setRoleId(role1.getRoleId());
-        sysUserRole1.setTenantId(Long.valueOf(tenantId));
+        sysUserRole1.setTenantId(tenantId);
 
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
         sysUserRoleList.add(sysUserRole);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -85,7 +85,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
 
     @Override
-    public SysTenantVo queryById(Long tenantId){
+    public SysTenantVo queryById(String tenantId){
         SysTenant db = this.baseMapper.selectById(tenantId);
         return BeanUtil.toBean(db, SysTenantVo.class);
     }
@@ -95,7 +95,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         LambdaQueryWrapper<SysTenant> lqw = Wrappers.lambdaQuery();
         lqw.ne(SysTenant::getStatus, -1);
         lqw.like(StrUtil.isNotBlank(bo.getTenantName()), SysTenant::getTenantName, bo.getTenantName());
-        lqw.eq(ObjectUtils.isNotNull(bo.getTenantid()),SysTenant::getTenantId, bo.getTenantid());
+        lqw.eq(ObjectUtils.isNotNull(bo.getTenantId()),SysTenant::getTenantId, bo.getTenantId());
         lqw.orderByDesc(SysTenant::getSort);
         return entity2Vo(this.list(lqw));
     }
@@ -168,12 +168,12 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long createTenantAdmin(SysTenantAdminBo bo) {
+    public String createTenantAdmin(SysTenantAdminBo bo) {
         if(Validator.isEmpty(bo.getTenantName())){
             throw new CustomException("没有企业名称");
         }
         //中正后台企业ID
-        Long tenantId = 867735392558919680L;
+        String tenantId = "867735392558919680";
         //设置新机构
         SysTenant sysTenant = getById(tenantId);
         sysTenant.setTenantName(bo.getTenantName());
@@ -183,7 +183,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         sysTenant.setHostH5Seller(null);
         sysTenant.setHostAdmin(null);
         //生成tenantId
-        Long newTenantId = createTenantId();
+        String newTenantId = createTenantId();
         sysTenant.setTenantId(newTenantId);
         if (!save(sysTenant)){
             throw new CustomException("创建企业失败");
@@ -247,16 +247,16 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     }
 
-    private Long createTenantId(){
+    private String createTenantId(){
         String randomNumeric = RandomStringUtils.randomNumeric(15);
         int count = count(new LambdaQueryWrapper<SysTenant>()
                 .eq(SysTenant::getTenantId, Long.valueOf(randomNumeric)));
         if (count == 0){
-            return Long.valueOf(randomNumeric);
+            return randomNumeric;
         }else {
             createTenantId();
         }
-        return Long.valueOf(randomNumeric);
+        return randomNumeric;
     }
 
     private boolean checkNameUnique(SysTenant entity) {
@@ -277,7 +277,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         add.setUpdateTime(DateUtils.getNowTime());
         this.save(add);
         //创建属于新公司的admin用户
-        Long tenantId = add.getTenantId();
+        String tenantId = add.getTenantId();
         ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId",String.valueOf(tenantId));
         SysUser user = new SysUser();
         user.setUserName("admin");
@@ -289,7 +289,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    public Long findTenantId(SysTenantQueryBo bo) {
+    public String findTenantId(SysTenantQueryBo bo) {
         return baseMapper.findTenantId(bo);
     }
 
@@ -306,13 +306,13 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
             throw new CustomException("没有企业名称");
         }
         //中正后台企业ID
-        Long tenantId = 867735392558919680L;
+        String tenantId = "867735392558919680";
         //设置新机构
         SysTenant sysTenant = getById(tenantId);
         sysTenant.setTenantName(bo.getTenantName());
         //生成tenantId
-//        Long newTenantId = createTenantId();
-        Long newTenantId = bo.getTenantId();
+//        String newTenantId = createTenantId();
+        String newTenantId = bo.getTenantId();
         sysTenant.setTenantId(newTenantId);
         sysTenant.setHostH5("");
         sysTenant.setHostPc("");
@@ -376,7 +376,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         initConfigAndDict(newTenantId,tenantId);
     }
 
-    private void initConfigAndDict(Long newTenantId, Long tenantId) {
+    private void initConfigAndDict(String newTenantId, String tenantId) {
         //字典
         List<SysDictType> dictTypes = iSysDictTypeService.getListByTenant(tenantId);
         if (CollectionUtils.isEmpty(dictTypes)){
@@ -409,24 +409,24 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    public void updateRoleTenant(List<Long> tenantIds) {
-        Long oldTenantId = 867735392558919680L;
-        for (Long tenantId : tenantIds) {
+    public void updateRoleTenant(List<String> tenantIds) {
+        String oldTenantId = "867735392558919680";
+        for (String tenantId : tenantIds) {
             initRoles(tenantId,oldTenantId);
         }
     }
 
     @Override
-    public void updateDictTenant(List<Long> tenantIds) {
-        Long oldTenantId = 867735392558919680L;
-        for (Long tenantId : tenantIds) {
+    public void updateDictTenant(List<String> tenantIds) {
+        String oldTenantId = "867735392558919680";
+        for (String tenantId : tenantIds) {
             initConfigAndDict(tenantId,oldTenantId);
         }
     }
 
     @Override
     public List<SysTenantBankAccountVo> getBankAccountList(String tenantId) {
-        SysTenant tenant = getById(Long.valueOf(tenantId));
+        SysTenant tenant = getById(tenantId);
         if (ObjectUtils.isNull(tenant)){
             throw new CustomException("机构信息获取失败！");
         }
@@ -479,7 +479,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         if (CollectionUtils.isEmpty(bo.getTenantIds())){
             throw new CustomException("参数错误");
         }
-        for (Long tenantId : bo.getTenantIds()) {
+        for (String tenantId : bo.getTenantIds()) {
             int count = topOldOrderService.count(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getTenantId, tenantId));
             int num = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getTenantId, tenantId));
             if (count > 0 || num > 0){
@@ -492,7 +492,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    public List<SysTenant> getListNoTenant(Long tenantId) {
+    public List<SysTenant> getListNoTenant(String tenantId) {
         return baseMapper.getListNoTenant(tenantId);
     }
 
@@ -501,7 +501,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         return baseMapper.getExamRoomTenant();
     }
 
-    private void initRoles(Long newTenantId,Long tenantId) {
+    private void initRoles(String newTenantId,String tenantId) {
         List<String> roleKey = new ArrayList<>();
         roleKey.add("seller");
         roleKey.add("seller_admin");
@@ -558,7 +558,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         });
     }
 
-    private Long getParentId(SysMenu oldSysMenu, Long tenantId, Long newTenantId) {
+    private Long getParentId(SysMenu oldSysMenu, String tenantId, String newTenantId) {
         if (oldSysMenu.getParentId() == 0){
             return 0L;
         }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1046,12 +1046,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public User queryUserByTelphoneTenant(String telphone,Long tenantId) {
+    public User queryUserByTelphoneTenant(String telphone,String tenantId) {
         return baseMapper.queryUserByTelphoneTenant(telphone,tenantId);
     }
 
     @Override
-    public User queryUserByIdNumTenant(String idNum, Long tenantId) {
+    public User queryUserByIdNumTenant(String idNum, String tenantId) {
         return baseMapper.queryUserByIdNumTenant(idNum, tenantId);
     }
 
@@ -1278,7 +1278,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (StringUtils.isNotBlank(per) && Integer.valueOf(per) == 2){
             //所有人都可以看
             user = userList.stream().filter(item -> {
-                Long tenantId = item.getTenantId();
+                String tenantId = item.getTenantId();
                 Course course = iCourseService.getCourseByNotTenant(Long.valueOf(cid));
                 Long courseId = iCourseService.getCourseByTenantTwo(course.getCourseName(),course.getCode(),tenantId);
                 CourseSection section = iCourseSectionService.getSectionByNotTenant(Long.valueOf(sid));
@@ -1321,7 +1321,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
             throw new BaseException("登录信息错误");
         }
-        Long tenantId = user.getTenantId();
+        String tenantId = user.getTenantId();
         //组装跳转路径
         SysTenant tenant = iSysTenantService.getById(tenantId);
         String post = "";
@@ -1427,7 +1427,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (StringUtils.isNotBlank(per) && Integer.valueOf(per) == 2){
             //所有人都可以看
             user = userList.stream().filter(item -> {
-                Long tenantId = item.getTenantId();
+                String tenantId = item.getTenantId();
                 Course course = iCourseService.getCourseByNotTenant(Long.valueOf(cid));
                 Long courseId = iCourseService.getCourseByTenantTwo(course.getCourseName(),course.getCode(),tenantId);
                 CourseSection section = iCourseSectionService.getSectionByNotTenant(Long.valueOf(sid));
@@ -1452,7 +1452,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             throw new BaseException("对不起，您的账号：已停用");
         }
 
-        Long tenantId = user.getTenantId();
+        String tenantId = user.getTenantId();
         //组装跳转路径
         SysTenant tenant = iSysTenantService.getById(tenantId);
         String post = "";
@@ -1519,7 +1519,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         Map<String, String> split = Splitter.on("&").withKeyValueSeparator("=").split(param);
         Long goodsId = Long.valueOf(split.get("gid"));
-        Long tenantId = user.getTenantId();
+        String tenantId = user.getTenantId();
 
         //获取对应商品
         Goods goods = iGoodsService.queryGoodsByIdTenant(goodsId,tenantId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGoodsPrice.java

@@ -44,6 +44,6 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-    private Long tenantId;
+    private String tenantId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityOrder.java

@@ -41,5 +41,5 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     private Long updateTime;
     /** 商户ID */
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Exam.java

@@ -69,7 +69,7 @@ private static final long serialVersionUID=1L;
     /** 开启模拟考 1启动(考试类型才能启动) 0关闭 */
     private Integer simulateStatus;
 
-    private Long tenantId;
+    private String tenantId;
 
     /** 模拟考配置参数 */
     @TableField(exist = false)

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamQuestion.java

@@ -37,5 +37,5 @@ private static final long serialVersionUID=1L;
     /** 多选 每项部分分，默认0分则不开启 */
     private BigDecimal partScore;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Question.java

@@ -61,7 +61,7 @@ private static final long serialVersionUID=1L;
     private String importNo;
     /** 导入顺序 */
     private Long importSort;
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
     /** 山东题库ID */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionBusiness.java

@@ -42,7 +42,7 @@ private static final long serialVersionUID=1L;
     /** $column.columnComment */
     private Long majorId;
 
-    private Long tenantId;
+    private String tenantId;
     private Integer type;
 
     @TableField(exist = false)

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionChapter.java

@@ -45,7 +45,7 @@ private static final long serialVersionUID=1L;
     /** 编码 */
     private String code;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionChapterExam.java

@@ -33,5 +33,5 @@ private static final long serialVersionUID=1L;
     @TableId(value = "id")
     private Long id;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionModule.java

@@ -43,7 +43,7 @@ private static final long serialVersionUID=1L;
     /** 编码 */
     private String code;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionModuleChapter.java

@@ -32,6 +32,6 @@ private static final long serialVersionUID=1L;
     private Long chapterExamId;
     /** 排序 */
     private Long sort;
-    private Long tenantId;
+    private String tenantId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/ExamMapper.java

@@ -23,5 +23,5 @@ public interface ExamMapper extends BaseMapper<Exam> {
     List<ExamVo> getPaperExamList(ExamPaperQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    Exam getExamByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    Exam getExamByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/ExamQuestionMapper.java

@@ -23,5 +23,5 @@ public interface ExamQuestionMapper extends BaseMapper<ExamQuestion> {
     List<ExamQuestionVo> getAppTempList(ExamQuestionQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("newExamId") Long newExamId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("newExamId") Long newExamId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionBusinessMapper.java

@@ -19,5 +19,5 @@ public interface QuestionBusinessMapper extends BaseMapper<QuestionBusiness> {
     List<QuestionBusiness> getListById(QuestionBusinessQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("majorId") Long majorId,@Param("newTenantId") Long newTenantId,@Param("type") Integer type);
+    void deleteByIdAndTenant(@Param("majorId") Long majorId,@Param("newTenantId") String newTenantId,@Param("type") Integer type);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionChapterExamMapper.java

@@ -23,5 +23,5 @@ public interface QuestionChapterExamMapper extends BaseMapper<QuestionChapterExa
     List<ExamVo> getDoList(QuestionChapterExamQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("newChapterExamId") Long newChapterExamId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("newChapterExamId") Long newChapterExamId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionChapterMapper.java

@@ -21,5 +21,5 @@ public interface QuestionChapterMapper extends BaseMapper<QuestionChapter> {
     QuestionChapterVo getById(Long chapterExamId);
 
     @InterceptorIgnore(tenantLine = "true")
-    QuestionChapter getChaptereExamByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    QuestionChapter getChaptereExamByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionMapper.java

@@ -38,5 +38,5 @@ public interface QuestionMapper extends BaseMapper<Question> {
 
     List<BankGoodsExamVo> getBankGoodsExamList(@Param("goodsId") Long goodsId);
 
-    Question getQuestionByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    Question getQuestionByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionModuleChapterMapper.java

@@ -22,5 +22,5 @@ public interface QuestionModuleChapterMapper extends BaseMapper<QuestionModuleCh
     List<QuestionChapterVo> getDoList(QuestionModuleChapterQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("newModuleExamId") Long newModuleExamId,@Param("newTenantId")  Long newTenantId);
+    void deleteByIdAndTenant(@Param("newModuleExamId") Long newModuleExamId,@Param("newTenantId")  String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionModuleMapper.java

@@ -21,5 +21,5 @@ public interface QuestionModuleMapper extends BaseMapper<QuestionModule> {
     List<QuestionModuleVo> getList(QuestionModuleQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    QuestionModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    QuestionModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IExamQuestionService.java

@@ -56,5 +56,5 @@ public interface IExamQuestionService extends IService<ExamQuestion> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    void deleteByIdAndTenant(Long newExamId, Long newTenantId);
+    void deleteByIdAndTenant(Long newExamId, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IExamService.java

@@ -58,7 +58,7 @@ public interface IExamService extends IService<Exam> {
 
     boolean batchDelExam(QuestionBatchDelBo bo);
 
-    Exam getExamByTenant(String code, Long newTenantId);
+    Exam getExamByTenant(String code, String newTenantId);
 
 	boolean getShanDongExam(Long userId,String majorname,Long relExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionBusinessService.java

@@ -52,5 +52,5 @@ public interface IQuestionBusinessService extends IService<QuestionBusiness> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId,Integer type);
+    void deleteByIdAndTenant(Long newModuleExamId, String newTenantId,Integer type);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionChapterExamService.java

@@ -56,5 +56,5 @@ public interface IQuestionChapterExamService extends IService<QuestionChapterExa
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    void deleteByIdAndTenant(Long newChapterExamId, Long newTenantId);
+    void deleteByIdAndTenant(Long newChapterExamId, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionChapterService.java

@@ -60,5 +60,5 @@ public interface IQuestionChapterService extends IService<QuestionChapter> {
 
     boolean batchDelChapterExam(QuestionBatchDelBo bo);
 
-	QuestionChapter getChaptereExamByTenant(String code, Long newTenantId);
+	QuestionChapter getChaptereExamByTenant(String code, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionModuleChapterService.java

@@ -55,5 +55,5 @@ public interface IQuestionModuleChapterService extends IService<QuestionModuleCh
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId);
+    void deleteByIdAndTenant(Long newModuleExamId, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionModuleService.java

@@ -55,5 +55,5 @@ public interface IQuestionModuleService extends IService<QuestionModule> {
 
     boolean batchDelModuleExam(QuestionBatchDelBo bo);
 
-    QuestionModule getModuleByTenant(String code, Long newTenantId);
+    QuestionModule getModuleByTenant(String code, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionService.java

@@ -103,7 +103,7 @@ public interface IQuestionService extends IService<Question> {
 	TodayExamWeekRecordDetailVo getTodayExamWeekRecord(Long goodsId, Long userId);
 
 
-    Question getQuestionByTenant(String code, Long newTenantId);
+    Question getQuestionByTenant(String code, String newTenantId);
 
 	String insertByAddBoImport(QuestionAddBo bo, Integer no);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamQuestionServiceImpl.java

@@ -114,7 +114,7 @@ public class ExamQuestionServiceImpl extends ServiceImpl<ExamQuestionMapper, Exa
     }
 
     @Override
-    public void deleteByIdAndTenant(Long newExamId, Long newTenantId) {
+    public void deleteByIdAndTenant(Long newExamId, String newTenantId) {
         baseMapper.deleteByIdAndTenant(newExamId, newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamServiceImpl.java

@@ -345,7 +345,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     }
 
     @Override
-    public Exam getExamByTenant(String code, Long newTenantId) {
+    public Exam getExamByTenant(String code, String newTenantId) {
         return baseMapper.getExamByTenant(code, newTenantId);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBusinessServiceImpl.java

@@ -106,7 +106,7 @@ public class QuestionBusinessServiceImpl extends ServiceImpl<QuestionBusinessMap
     }
 
     @Override
-    public void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId,Integer type) {
+    public void deleteByIdAndTenant(Long newModuleExamId, String newTenantId,Integer type) {
         baseMapper.deleteByIdAndTenant(newModuleExamId, newTenantId,type);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterExamServiceImpl.java

@@ -114,7 +114,7 @@ public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterE
     }
 
     @Override
-    public void deleteByIdAndTenant(Long newChapterExamId, Long newTenantId) {
+    public void deleteByIdAndTenant(Long newChapterExamId, String newTenantId) {
         baseMapper.deleteByIdAndTenant(newChapterExamId, newTenantId);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterServiceImpl.java

@@ -229,7 +229,7 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
     }
 
     @Override
-    public QuestionChapter getChaptereExamByTenant(String code, Long newTenantId) {
+    public QuestionChapter getChaptereExamByTenant(String code, String newTenantId) {
         return baseMapper.getChaptereExamByTenant(code, newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionModuleChapterServiceImpl.java

@@ -110,7 +110,7 @@ public class QuestionModuleChapterServiceImpl extends ServiceImpl<QuestionModule
     }
 
     @Override
-    public void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId) {
+    public void deleteByIdAndTenant(Long newModuleExamId, String newTenantId) {
         baseMapper.deleteByIdAndTenant(newModuleExamId, newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionModuleServiceImpl.java

@@ -207,7 +207,7 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
     }
 
     @Override
-    public QuestionModule getModuleByTenant(String code, Long newTenantId) {
+    public QuestionModule getModuleByTenant(String code, String newTenantId) {
         return baseMapper.getModuleByTenant(code, newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -2989,7 +2989,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     @Override
-    public Question getQuestionByTenant(String code, Long newTenantId) {
+    public Question getQuestionByTenant(String code, String newTenantId) {
         return baseMapper.getQuestionByTenant(code, newTenantId);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/Certificate.java

@@ -41,7 +41,7 @@ private static final long serialVersionUID=1L;
     /** 备注 */
     private String remark;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateCommon.java

@@ -43,7 +43,7 @@ private static final long serialVersionUID=1L;
     /** 证书类型ID */
     private Long certificateTypeId;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateTp.java

@@ -49,7 +49,7 @@ private static final long serialVersionUID=1L;
     /** 证书ID */
     private Long certificateId;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileField.java

@@ -40,7 +40,7 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 输入类型 1输入框 2下拉选择 3上传文件 4下载文件 5时间选择器 */
     private Long inputType;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileTp.java

@@ -47,7 +47,7 @@ private static final long serialVersionUID=1L;
     /** 商品id拼接，多个,拼接 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String goodsIds;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileTpBusiness.java

@@ -35,5 +35,5 @@ private static final long serialVersionUID=1L;
     /** 项目ID */
     private Long projectId;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/CertificateCommonMapper.java

@@ -21,5 +21,5 @@ public interface CertificateCommonMapper extends BaseMapper<CertificateCommon> {
     List<CertificateCommonVo> getList(CertificateCommonQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    CertificateCommon getCertificateByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    CertificateCommon getCertificateByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/CertificateMapper.java

@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
 public interface CertificateMapper extends BaseMapper<Certificate> {
 
     @InterceptorIgnore(tenantLine = "true")
-    Certificate getCertificateByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    Certificate getCertificateByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/CertificateTpMapper.java

@@ -21,5 +21,5 @@ public interface CertificateTpMapper extends BaseMapper<CertificateTp> {
     List<CertificateTpVo> selectListByBo(CertificateTpQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    CertificateTp getCertificateTpByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    CertificateTp getCertificateTpByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/ICertificateCommonService.java

@@ -54,6 +54,6 @@ public interface ICertificateCommonService extends IService<CertificateCommon> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    CertificateCommon getCertificateByTenant(String code, Long newTenantId);
+    CertificateCommon getCertificateByTenant(String code, String newTenantId);
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/ICertificateService.java

@@ -53,5 +53,5 @@ public interface ICertificateService extends IService<Certificate> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    Certificate getCertificateByTenant(String code, Long newTenantId);
+    Certificate getCertificateByTenant(String code, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/ICertificateTpService.java

@@ -55,5 +55,5 @@ public interface ICertificateTpService extends IService<CertificateTp> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    CertificateTp getCertificateTpByTenant(String code, Long newTenantId);
+    CertificateTp getCertificateTpByTenant(String code, String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateCommonServiceImpl.java

@@ -108,7 +108,7 @@ public class CertificateCommonServiceImpl extends ServiceImpl<CertificateCommonM
     }
 
     @Override
-    public CertificateCommon getCertificateByTenant(String code, Long newTenantId) {
+    public CertificateCommon getCertificateByTenant(String code, String newTenantId) {
         return baseMapper.getCertificateByTenant(code,newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateServiceImpl.java

@@ -109,7 +109,7 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
     }
 
     @Override
-    public Certificate getCertificateByTenant(String code, Long newTenantId) {
+    public Certificate getCertificateByTenant(String code, String newTenantId) {
         return baseMapper.getCertificateByTenant(code,newTenantId);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -693,7 +693,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     }
 
     @Override
-    public CertificateTp getCertificateTpByTenant(String code, Long newTenantId) {
+    public CertificateTp getCertificateTpByTenant(String code, String newTenantId) {
         return baseMapper.getCertificateTpByTenant(code, newTenantId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/ExternalQuestionBo.java

@@ -21,6 +21,6 @@ public class ExternalQuestionBo implements Serializable {
     @NotBlank(message = "签名不能为空")
     private String sign;
 
-    private Long tenantId;
+    private String tenantId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/ReplenishExamBo.java

@@ -21,5 +21,5 @@ public class ReplenishExamBo implements Serializable {
     @NotBlank(message = "签名不能为空")
     private String sign;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -69,7 +69,7 @@ private static final long serialVersionUID=1L;
     private Long projectId;
     /** 1显示 0隐藏 */
     private Integer courseShow;
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
     /** 优选生成 0否 1是 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -72,7 +72,7 @@ private static final long serialVersionUID=1L;
     private Integer periodType;
     /** 学时审核层级：1初审，2初审和复审 */
     private Integer periodNumber;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -48,7 +48,7 @@ private static final long serialVersionUID=1L;
     private String code;
     /** 导入编号 */
     private String importNo;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapterBusiness.java

@@ -36,7 +36,7 @@ private static final long serialVersionUID=1L;
     private Long subjectId;
     /** 项目ID */
     private Long projectId;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private String educationName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapterSection.java

@@ -31,7 +31,7 @@ private static final long serialVersionUID=1L;
     private Long sectionId;
     /** 章ID */
     private Long chapterId;
-    private Long tenantId;
+    private String tenantId;
 
     private Long sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationTier.java

@@ -30,5 +30,5 @@ private static final long serialVersionUID=1L;
     private Long educationId;
     /** 1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业 */
     private String tireStatus;
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationType.java

@@ -44,7 +44,7 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseFile.java

@@ -48,7 +48,7 @@ private static final long serialVersionUID=1L;
     /** 类型：1文件 2文件夹 */
     private Integer type;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oldId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseHandouts.java

@@ -53,7 +53,7 @@ private static final long serialVersionUID=1L;
     /** 修改状态：1正常 0修改中 */
     private Integer updateStatus;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
     @TableField(exist = false)

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseHandoutsBusiness.java

@@ -43,5 +43,5 @@ private static final long serialVersionUID=1L;
     /** 科目ID */
     private Long subjectId;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseMenu.java

@@ -44,7 +44,7 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 排序 */
     private Integer sort;
-    private Long tenantId;
+    private String tenantId;
     /** 是否优选  0没有 1选中 */
     private Integer firstChoiceStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseMenuExam.java

@@ -45,5 +45,5 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java

@@ -48,7 +48,7 @@ private static final long serialVersionUID=1L;
     private Integer examType;
     /** 赠送卷ID */
     private Long freeExamId;
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModuleBusiness.java

@@ -37,7 +37,7 @@ private static final long serialVersionUID=1L;
     /** 项目ID */
     private Long projectId;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private String educationName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModuleChapter.java

@@ -31,7 +31,7 @@ private static final long serialVersionUID=1L;
     /** 章ID */
     private Long chapterId;
 
-    private Long tenantId;
+    private String tenantId;
 
     private Long sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseProjectType.java

@@ -44,7 +44,7 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 排序 */
     private Integer sort;
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSection.java

@@ -73,7 +73,7 @@ private static final long serialVersionUID=1L;
     private Long realDuration;
     /** 讲师ID */
     private Long teacherId;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private Long oId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSectionBusiness.java

@@ -37,7 +37,7 @@ private static final long serialVersionUID=1L;
     /** 项目ID */
     private Long projectId;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private String educationName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSectionWatchPer.java

@@ -57,5 +57,5 @@ public class CourseSectionWatchPer implements Serializable {
     private Long updateTime;
 
     /** 商户ID */
-    private Long tenantId;
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseStreaming.java

@@ -59,7 +59,7 @@ private static final long serialVersionUID=1L;
     /** 本地保利威视频ID */
     private Long polyvId;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseStreamingBusiness.java

@@ -34,7 +34,7 @@ private static final long serialVersionUID=1L;
     private Long businessId;
     /** 项目ID */
     private Long projectId;
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(exist = false)
     private String educationName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.java

@@ -43,7 +43,7 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
 
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubjectProject.java

@@ -31,7 +31,7 @@ private static final long serialVersionUID=1L;
     /** 科目ID */
     private Long subjectId;
 
-    private Long tenantId;
+    private String tenantId;
 
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorProject.java

@@ -31,7 +31,7 @@ private static final long serialVersionUID=1L;
     /** 科目ID */
     private Long majorId;
 
-    private Long tenantId;
+    private String tenantId;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseBusinessMapper.java

@@ -25,10 +25,10 @@ public interface CourseBusinessMapper extends BaseMapper<CourseBusiness> {
     String queryFullName(CourseBusinessQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseBusiness getBusinessByTenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
+    CourseBusiness getBusinessByTenant(@Param("encoder") String encoder,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseBusiness getBusinessByIdTenant(@Param("businessId") Long businessId,@Param("tenantId") Long tenantId);
+    CourseBusiness getBusinessByIdTenant(@Param("businessId") Long businessId,@Param("tenantId") String tenantId);
 
     CourseBusinessVo queryFullId(CourseBusinessQueryBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterBusinessMapper.java

@@ -17,5 +17,5 @@ public interface CourseChapterBusinessMapper extends BaseMapper<CourseChapterBus
     List<CourseChapterBusiness> getListById(Long id);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterMapper.java

@@ -23,5 +23,5 @@ public interface CourseChapterMapper extends BaseMapper<CourseChapter> {
     CourseChapterVo getInfo(Long chapterId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseChapter getChapterByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    CourseChapter getChapterByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterSectionMapper.java

@@ -48,8 +48,8 @@ public interface CourseChapterSectionMapper extends BaseMapper<CourseChapterSect
                           @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseChapterSection getByTenant(@Param("newChapterId") Long newChapterId,@Param("newSectionId") Long newSectionId,@Param("newTenantId") Long newTenantId);
+    CourseChapterSection getByTenant(@Param("newChapterId") Long newChapterId,@Param("newSectionId") Long newSectionId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseEducationTypeMapper.java

@@ -20,8 +20,8 @@ public interface CourseEducationTypeMapper extends BaseMapper<CourseEducationTyp
    List<BaseFilterVo> selectUserAllBusinessList(@Param("userId") Long userId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseEducationType getEducationTypeBytenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
+    CourseEducationType getEducationTypeBytenant(@Param("encoder") String encoder,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseEducationType getEducationTypeByIdtenant(@Param("educationTypeId")Long educationTypeId,@Param("tenantId") Long tenantId);
+    CourseEducationType getEducationTypeByIdtenant(@Param("educationTypeId")Long educationTypeId,@Param("tenantId") String tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseFileMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface CourseFileMapper extends BaseMapper<CourseFile> {
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByTenant(@Param("handoutsId") Long handoutsId,@Param("newTenantId") Long newTenantId);
+    void deleteByTenant(@Param("handoutsId") Long handoutsId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseHandoutsMapper.java

@@ -26,23 +26,23 @@ public interface CourseHandoutsMapper extends BaseMapper<CourseHandouts> {
     List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseHandouts getHandoutsByTenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
+    CourseHandouts getHandoutsByTenant(@Param("encoder") String encoder,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<Long> getGoodsIds(@Param("handoutsId") Long handoutsId,@Param("tenantId") Long tenantId);
+    List<Long> getGoodsIds(@Param("handoutsId") Long handoutsId,@Param("tenantId") String tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void removeHandouts(@Param("handoutsId") Long handoutsId,@Param("tenantId") Long tenantId);
+    void removeHandouts(@Param("handoutsId") Long handoutsId,@Param("tenantId") String tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void removeHandoutsBusiness(@Param("handoutsId") Long handoutsId,@Param("tenantId") Long tenantId);
+    void removeHandoutsBusiness(@Param("handoutsId") Long handoutsId,@Param("tenantId") String tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void removeHandoutsFile(@Param("handoutsId") Long handoutsId,@Param("tenantId") Long tenantId);
+    void removeHandoutsFile(@Param("handoutsId") Long handoutsId,@Param("tenantId") String tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<CourseHandouts> getHandoutsListByTenant(@Param("encoder") String encoder,@Param("handoutsName") String handoutsName,@Param("tenantId") Long tenantId);
+    List<CourseHandouts> getHandoutsListByTenant(@Param("encoder") String encoder,@Param("handoutsName") String handoutsName,@Param("tenantId") String tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void removeHandoutsRecord(@Param("handoutsId")Long handoutsId,@Param("tenantId") Long tenantId);
+    void removeHandoutsRecord(@Param("handoutsId")Long handoutsId,@Param("tenantId") String tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMapper.java

@@ -53,7 +53,7 @@ public interface CourseMapper extends BaseMapper<Course> {
     ClassGradeVo gradeIdSelect(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId, @Param("orderGoodsId") Long orderGoodsId);
 
     @InterceptorIgnore(tenantLine = "true")
-    ClassGradeVo gradeIdSelectTenant(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId,@Param("tenantId") Long tenantId);
+    ClassGradeVo gradeIdSelectTenant(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId,@Param("tenantId") String tenantId);
 
     Long goodsRebuildStatus(CourseQueryBo bo);
 
@@ -62,13 +62,13 @@ public interface CourseMapper extends BaseMapper<Course> {
     List<ClassGradeVo> gradeIdUserSelect(@Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId);
 
     @InterceptorIgnore(tenantLine = "true")
-    Course getCourseByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    Course getCourseByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
     Course getCourseByNotTenant(@Param("cid") Long cid);
 
     @InterceptorIgnore(tenantLine = "true")
-    Long getCourseByTenantTwo(@Param("courseName") String courseName,@Param("code") String code,@Param("tenantId") Long tenantId);
+    Long getCourseByTenantTwo(@Param("courseName") String courseName,@Param("code") String code,@Param("tenantId") String tenantId);
 
     List<SpecialQuestionVo> getSpecialQuestionList(SpecialQuestionBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuExamMapper.java

@@ -19,14 +19,14 @@ public interface CourseMenuExamMapper extends BaseMapper<CourseMenuExam> {
     List<CourseMenuExamVo> getList(CourseMenuExamQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteModuleByIdTenant(@Param("newCourseId")Long newCourseId,@Param("newModuleId") Long newModuleId,@Param("newTenantId") Long newTenantId);
+    void deleteModuleByIdTenant(@Param("newCourseId")Long newCourseId,@Param("newModuleId") Long newModuleId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteChapterByIdTenant(@Param("newCourseId")Long newCourseId, @Param("newModuleId")Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newTenantId") Long newTenantId);
+    void deleteChapterByIdTenant(@Param("newCourseId")Long newCourseId, @Param("newModuleId")Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteSectionByIdTenant(@Param("newCourseId")Long newCourseId, @Param("newModuleId")Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newSectionId") Long newSectionId,@Param("newTenantId") Long newTenantId);
+    void deleteSectionByIdTenant(@Param("newCourseId")Long newCourseId, @Param("newModuleId")Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newSectionId") Long newSectionId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuMapper.java

@@ -38,10 +38,10 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
     List<CourseUserMenuVo> getGoodsMenuList(CourseMenuQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<CourseMenu> selectByNotTenant(@Param("newCourseId") Long newCourseId,@Param("type") Integer type,@Param("newModuleId") Long newModuleId,@Param("newTenantId") Long newTenantId);
+    List<CourseMenu> selectByNotTenant(@Param("newCourseId") Long newCourseId,@Param("type") Integer type,@Param("newModuleId") Long newModuleId,@Param("newTenantId") String newTenantId);
 
     Long countChapterTotalTime(@Param("chapterId") Long chapterId);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseModuleBusinessMapper.java

@@ -17,5 +17,5 @@ public interface CourseModuleBusinessMapper extends BaseMapper<CourseModuleBusin
     List<CourseModuleBusiness> getListById(Long moduleId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("moduleId") Long moduleId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("moduleId") Long moduleId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseModuleChapterMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2021-10-11
  */
 public interface CourseModuleChapterMapper extends BaseMapper<CourseModuleChapter> {
-    List<CourseModuleChapterVo> getListById(@Param("id") Long id,@Param("tenantId") Long tenantId);
+    List<CourseModuleChapterVo> getListById(@Param("id") Long id,@Param("tenantId") String tenantId);
 
     List<CourseUserModuleChapterVo> chapterList(CourseMenuQueryBo bo);
 
@@ -29,8 +29,8 @@ public interface CourseModuleChapterMapper extends BaseMapper<CourseModuleChapte
                               @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
     @InterceptorIgnore(tenantLine = "true")
-    void deleteByIdAndTenant(@Param("newModuleId") Long newModuleId,@Param("newTenantId") Long newTenantId);
+    void deleteByIdAndTenant(@Param("newModuleId") Long newModuleId,@Param("newTenantId") String newTenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseModuleChapter getByTenant(@Param("newModuleId") Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newTenantId") Long newTenantId);
+    CourseModuleChapter getByTenant(@Param("newModuleId") Long newModuleId,@Param("newChapterId") Long newChapterId,@Param("newTenantId") String newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseModuleMapper.java

@@ -22,5 +22,5 @@ public interface CourseModuleMapper extends BaseMapper<CourseModule> {
     List<CourseModuleVo> selectListByBo(CourseModuleQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    CourseModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+    CourseModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") String newTenantId);
 }