merge

run-dev.sh

@@ -24,6 +24,7 @@ docker run -p 5055:5055 --name ${app_name} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/dev_api:/logs \
 -v /mydata/app/${app_name}/logs:/var/logs \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
@@ -62,6 +63,7 @@ docker run \
 --add-host=gdxypx.xy.com:192.168.1.210 \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/dev_admin:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

run-pre.sh

@@ -24,6 +24,7 @@ docker run -p 6055:5055 --name ${app_name} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/pre_api:/logs \
 -v /mydata-pre/app/${app_name}/logs:/var/logs \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
@@ -65,6 +66,7 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/pre_admin:/logs \
 -v /mydata-pre/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

run-prod.sh

@@ -23,6 +23,7 @@ docker run -p 5055:5055 --name ${app_name} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
 -v /mydata/app/${app_name}/logs:/var/logs \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
@@ -59,6 +60,7 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_admin:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

run-trial.sh

@@ -23,6 +23,7 @@ docker run -p 6055:5055 --name ${app_name} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/trial_api:/logs \
 -v /mydata/app/${app_name}/logs:/var/logs \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
@@ -59,6 +60,7 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/trial_admin:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.controller.common;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
@@ -36,8 +38,10 @@ import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.service.impl.OrderServiceImpl;
 import com.zhongzheng.modules.system.bo.SysTenantAdminBo;
+import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.system.vo.SysTenantVo;
 import com.zhongzheng.modules.user.vo.UserExportVo;
 import com.zhongzheng.modules.wx.bo.WxShareGoodsBo;
 import com.zhongzheng.modules.wx.service.IWxPayService;
@@ -58,6 +62,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 通用请求处理
@@ -297,4 +302,17 @@ public class CommonController
         iSysTenantService.createTenantAdmin(bo);
         return AjaxResult.success();
     }
+
+    @ApiOperation("获取企业列表")
+    @GetMapping("common/tenant/list")
+    public AjaxResult<List<SysTenantVo>> getTenantList() {
+        String tenant = ServletUtils.getRequest().getHeader("TenantId");
+        List<SysTenant> list = iSysTenantService.list();
+        if (CollectionUtils.isEmpty(list)){
+            return AjaxResult.success(new ArrayList<>());
+        }
+        List<SysTenantVo> collect = list.stream().filter(x -> !x.getTenantId().equals(Long.valueOf(tenant)))
+                .map(item -> BeanUtil.toBean(item, SysTenantVo.class)).collect(Collectors.toList());
+        return AjaxResult.success(collect);
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -330,6 +330,15 @@ public class GoodsController extends BaseController {
         return toAjax(iGoodsService.goodsBatchCopyTenant(bo) ? 1 : 0);
     }
 
+    /**
+     * 商品批量复制（新机构）
+     */
+    @ApiOperation("商品批量复制（增量）")
+    @PostMapping("/batch/copy/add")
+    public AjaxResult<Void> goodsBatchCopyAddTenant(@RequestBody GoodsBatchCopyTenantBo bo) {
+        return toAjax(iGoodsService.goodsBatchCopyIncrementTenant(bo) ? 1 : 0);
+    }
+
     /**
      * 商品关系ID处理（全量复制后的处理方法）
      */
@@ -338,4 +347,13 @@ public class GoodsController extends BaseController {
     public AjaxResult<Void> goodsBatchCopyDisposeTenant() {
         return toAjax(iGoodsService.goodsBatchCopyDisposeTenant() ? 1 : 0);
     }
+
+    /**
+     * 修改商品课程关联
+     */
+    @ApiOperation("修改商品课程关联")
+    @PostMapping("/update/course")
+    public AjaxResult<Void> updateCourse() {
+        return toAjax(iGoodsService.goodsBatchCopyDisposeTenant() ? 1 : 0);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zhongzheng.controller.system;
 
 import java.util.List;
 
+import com.zhongzheng.modules.system.vo.SysConfigVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,10 +47,10 @@ public class SysConfigController extends BaseController
     @ApiOperation("配置列表")
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
+    public TableDataInfo list(SysConfigVo config)
     {
         startPage();
-        List<SysConfig> list = configService.selectConfigList(config);
+        List<SysConfigVo> list = configService.selectConfigList(config);
         return getDataTable(list);
     }
 
@@ -92,7 +93,7 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    public AjaxResult add(@Validated @RequestBody SysConfigVo config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
@@ -109,7 +110,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    public AjaxResult edit(@Validated @RequestBody SysConfigVo config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {

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

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
 import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
 import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.vo.SysConfigVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -39,11 +40,11 @@ public class ActivityHomeController extends BaseController {
     @ApiOperation("首页配置列表")
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
+    public TableDataInfo list(SysConfigVo config)
     {
         startPage();
         config.setConfigModule("home");
-        List<SysConfig> list = configService.selectConfigList(config);
+        List<SysConfigVo> list = configService.selectConfigList(config);
         return getDataTable(list);
     }
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ServletUtils.java

@@ -25,13 +25,13 @@ public class ServletUtils
     public static String getEncoded(String tag)
     {
         String time = String.valueOf(System.currentTimeMillis()/1000);
-        return tag+Integer.valueOf(time.substring(1))+(int)((Math.random()*10));
+        return tag+Integer.valueOf(time.substring(1))+(int)((Math.random()*100));
     }
     //导入生成编号使用
     public static String getImportEncoded(String tag)
     {
         String time = String.valueOf(System.currentTimeMillis()/1000);
-        return tag+Integer.valueOf(time.substring(2));
+        return tag+Integer.valueOf(time.substring(2))+(int)((Math.random()*100));
     }
     /**
      * 获取String参数

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

@@ -121,6 +121,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private IUserStudyLogService iUserStudyLogService;
 
+    @Autowired
+    private IUserLoginErrorService iUserLoginErrorService;
+
 
     @Override
     public UserVo queryById(Long userId) {
@@ -847,11 +850,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
         User user = getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, bo.getUserId()));
         if(Validator.isEmpty(user)){
-            throw new BaseException("用户不存在");
+            throw new BaseException("用户信息错误");
         }
         if (!SecurityUtils.matchesPassword(bo.getOldPwd(),user.getPassword() ))
         {
-            throw new BaseException("密码错误");
+            throw new BaseException("用户信息错误");
         }
         if (Validator.isEmpty(bo.getNewPwd()))
         {
@@ -928,7 +931,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Map<String, Object> telphone_login(UserAppTelphoneLoginBo bo) {
-        Object cacheObject = redisCache.getCacheObjectNoTenant(bo.getSign());
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        Object cacheObject = redisCache.getCacheObjectNoTenant(tenantId+":"+bo.getSign());
         if (ObjectUtil.isNull(cacheObject)){
             throw new CustomException("该账号不存在！");
         }
@@ -949,6 +953,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return map;
     }
 
+    @Override
+    public List<User> getUserByTelNotTenant(String telphone) {
+        return baseMapper.getUserByTelNotTenant(telphone);
+    }
+
     private Long findSubjectId(String subject){
         if(subject!=null){
             String key = "SUB_"+subject;
@@ -988,6 +997,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isEmpty(user)){
@@ -1003,14 +1013,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(bo.getTel()==null){
             throw new CustomException("手机号不能为空");
         }
+        iUserLoginErrorService.checkLimit(bo.getTel());
         String key = Constants.LOGIN_SMS + bo.getTel();
         String code =  redisCache.getCacheObject(key);
         if(code==null){
             throw new CustomException("验证码错误");
         }
         if(!code.equals(bo.getCode())){
+            iUserLoginErrorService.saveErrorLog(bo.getTel());
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isEmpty(user)){
@@ -1043,6 +1056,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isNotEmpty(user)){
@@ -1068,6 +1082,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(bo.getAccount())){
             throw new CustomException("账号不能为空");
         }
+        iUserLoginErrorService.checkLimit(bo.getAccount());
         LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
         queryWrapper.and(wq -> wq
                 .eq(User::getTelphone,bo.getAccount())
@@ -1075,7 +1090,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .eq(User::getIdCard,bo.getAccount()));
         User user = getOne(queryWrapper);
         if(Validator.isEmpty(user)){
-            throw new CustomException("该账号不存在");
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new CustomException("登录信息错误");
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
@@ -1097,7 +1113,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
-            throw new BaseException("密码错误");
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new BaseException("登录信息错误");
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(bo.getShareActivityCode())){

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

@@ -1196,16 +1196,18 @@ public class WxLoginService implements IWxLoginService {
         initData();
         String param = String.format(gzh_wxAuthParam, gzh_appid, gzh_appsrcret, loginBody.getCode());
         String resultString = HttpUtils.sendGet(gzh_wxAuthUrl, param);
+        System.out.println(resultString);
         //解析json
         JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
         String access_token = String.valueOf(jsonObject.get("access_token"));
-        if(Validator.isEmpty(access_token)||access_token.equals("null")){
-            throw new CustomException( String.valueOf(jsonObject.get("errmsg ")));
+        if(access_token.equals("null")){
+            throw new CustomException( String.valueOf(jsonObject.get("errmsg")));
         }
         String openId = String.valueOf(jsonObject.get("openid"));
 
         String userInfoParam = String.format(gzh_wxUserInfoParam, access_token, openId);
         String userInfoResultString = HttpUtils.sendGet(gzh_wxUserInfoUrl, userInfoParam);
+        System.out.println(userInfoResultString);
         //解析json
         JSONObject jsonObject1 = (JSONObject) JSONObject.parse(userInfoResultString);
         String unionId = String.valueOf(jsonObject1.get("unionid"));

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

@@ -74,4 +74,6 @@ private static final long serialVersionUID=1L;
     /** 模拟考配置参数 */
     @TableField(exist = false)
     private ExamSimulateConfigBo simulateConfig;
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -62,4 +62,7 @@ private static final long serialVersionUID=1L;
     /** 导入顺序 */
     private Long importSort;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

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

@@ -46,4 +46,7 @@ private static final long serialVersionUID=1L;
     private String code;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

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

@@ -44,4 +44,8 @@ private static final long serialVersionUID=1L;
     private String code;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
+
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.ExamQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
@@ -7,6 +8,7 @@ import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.exam.bo.ExamPaperQueryBo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,4 +21,7 @@ import java.util.List;
 public interface ExamMapper extends BaseMapper<Exam> {
     List<ExamVo> getList(ExamQueryBo bo);
     List<ExamVo> getPaperExamList(ExamPaperQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Exam getExamByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
 import com.zhongzheng.modules.bank.domain.ExamQuestion;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +22,6 @@ public interface ExamQuestionMapper extends BaseMapper<ExamQuestion> {
     List<ExamQuestionVo> getAppList(ExamQuestionQueryBo bo);
     List<ExamQuestionVo> getAppTempList(ExamQuestionQueryBo bo);
 
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("newExamId") Long newExamId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,9 +1,11 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +17,7 @@ import java.util.List;
  */
 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);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,4 +21,7 @@ public interface QuestionChapterExamMapper extends BaseMapper<QuestionChapterExa
     List<ExamVo> getList(QuestionChapterExamQueryBo bo);
 
     List<ExamVo> getDoList(QuestionChapterExamQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("newChapterExamId") Long newChapterExamId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,10 +1,12 @@
 package com.zhongzheng.modules.bank.mapper;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.ExamQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionChapterQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionChapter;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ import java.util.List;
 public interface QuestionChapterMapper extends BaseMapper<QuestionChapter> {
     List<QuestionChapterVo> getList(QuestionChapterQueryBo bo);
     QuestionChapterVo getById(Long chapterExamId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    QuestionChapter getChaptereExamByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

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

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionModuleChapter;
 import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +20,7 @@ import java.util.List;
 public interface QuestionModuleChapterMapper extends BaseMapper<QuestionModuleChapter> {
     List<QuestionChapterVo> getList(QuestionModuleChapterQueryBo bo);
     List<QuestionChapterVo> getDoList(QuestionModuleChapterQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("newModuleExamId") Long newModuleExamId,@Param("newTenantId")  Long newTenantId);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.QuestionChapterQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionModuleQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionModule;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
 import com.zhongzheng.modules.bank.vo.QuestionModuleVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ import java.util.List;
  */
 public interface QuestionModuleMapper extends BaseMapper<QuestionModule> {
     List<QuestionModuleVo> getList(QuestionModuleQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    QuestionModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

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

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

@@ -57,4 +57,6 @@ public interface IExamService extends IService<Exam> {
 	List<ExamVo> getPaperExamList(ExamPaperQueryBo bo);
 
     boolean batchDelExam(QuestionBatchDelBo bo);
+
+    Exam getExamByTenant(String code, Long newTenantId);
 }

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

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

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

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

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

@@ -59,4 +59,6 @@ public interface IQuestionChapterService extends IService<QuestionChapter> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean batchDelChapterExam(QuestionBatchDelBo bo);
+
+	QuestionChapter getChaptereExamByTenant(String code, Long newTenantId);
 }

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

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

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

@@ -54,4 +54,6 @@ public interface IQuestionModuleService extends IService<QuestionModule> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean batchDelModuleExam(QuestionBatchDelBo bo);
+
+    QuestionModule getModuleByTenant(String code, Long newTenantId);
 }

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

@@ -98,5 +98,5 @@ public interface IQuestionService extends IService<Question> {
 	TodayExamWeekRecordDetailVo getTodayExamWeekRecord(Long goodsId, Long userId);
 
 
-
+    Question getQuestionByTenant(String code, Long newTenantId);
 }

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

@@ -114,4 +114,9 @@ public class ExamQuestionServiceImpl extends ServiceImpl<ExamQuestionMapper, Exa
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long newExamId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(newExamId, newTenantId);
+    }
 }

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

@@ -340,4 +340,9 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
                 .set(Exam::getStatus,bo.getStatus())
                 .in(Exam::getExamId,bo.getIds()));
     }
+
+    @Override
+    public Exam getExamByTenant(String code, Long newTenantId) {
+        return baseMapper.getExamByTenant(code, newTenantId);
+    }
 }

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

@@ -106,4 +106,9 @@ public class QuestionBusinessServiceImpl extends ServiceImpl<QuestionBusinessMap
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId,Integer type) {
+        baseMapper.deleteByIdAndTenant(newModuleExamId, newTenantId,type);
+    }
 }

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

@@ -113,4 +113,9 @@ public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterE
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long newChapterExamId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(newChapterExamId, newTenantId);
+    }
 }

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

@@ -221,4 +221,9 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
                 .set(QuestionChapter::getStatus,bo.getStatus())
                 .in(QuestionChapter::getChapterExamId,bo.getIds()));
     }
+
+    @Override
+    public QuestionChapter getChaptereExamByTenant(String code, Long newTenantId) {
+        return baseMapper.getChaptereExamByTenant(code, newTenantId);
+    }
 }

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

@@ -111,4 +111,9 @@ public class QuestionModuleChapterServiceImpl extends ServiceImpl<QuestionModule
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long newModuleExamId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(newModuleExamId, newTenantId);
+    }
 }

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

@@ -206,4 +206,9 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
                 .set(QuestionModule::getUpdateTime,DateUtils.getNowTime())
                 .in(QuestionModule::getModuleExamId,bo.getIds()));
     }
+
+    @Override
+    public QuestionModule getModuleByTenant(String code, Long newTenantId) {
+        return baseMapper.getModuleByTenant(code, newTenantId);
+    }
 }

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

@@ -1995,7 +1995,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         return result;
     }
 
-
+    @Override
+    public Question getQuestionByTenant(String code, Long newTenantId) {
+        return baseMapper.getQuestionByTenant(code, newTenantId);
+    }
 
 
     private String getPercent(Integer x,Integer y){

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

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private String remark;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -44,4 +44,7 @@ private static final long serialVersionUID=1L;
     private Long certificateTypeId;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -50,4 +50,6 @@ private static final long serialVersionUID=1L;
     private Long certificateId;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

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

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

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

@@ -48,4 +48,7 @@ private static final long serialVersionUID=1L;
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String goodsIds;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.base.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
 import com.zhongzheng.modules.base.bo.CertificateTpQueryBo;
 import com.zhongzheng.modules.base.domain.CertificateCommon;
 import com.zhongzheng.modules.base.vo.CertificateCommonVo;
 import com.zhongzheng.modules.base.vo.CertificateTpVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ import java.util.List;
  */
 public interface CertificateCommonMapper extends BaseMapper<CertificateCommon> {
     List<CertificateCommonVo> getList(CertificateCommonQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CertificateCommon getCertificateByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.base.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.base.domain.Certificate;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 证书Mapper接口
@@ -11,4 +13,6 @@ import com.zhongzheng.modules.base.domain.Certificate;
  */
 public interface CertificateMapper extends BaseMapper<Certificate> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    Certificate getCertificateByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.base.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.base.bo.CertificateTpQueryBo;
 import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
 import com.zhongzheng.modules.base.domain.CertificateTp;
 import com.zhongzheng.modules.base.vo.CertificateTpVo;
 import com.zhongzheng.modules.base.vo.UserProfileVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ import java.util.List;
  */
 public interface CertificateTpMapper extends BaseMapper<CertificateTp> {
     List<CertificateTpVo> selectListByBo(CertificateTpQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CertificateTp getCertificateTpByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

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

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

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

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

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

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

@@ -106,4 +106,9 @@ public class CertificateCommonServiceImpl extends ServiceImpl<CertificateCommonM
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public CertificateCommon getCertificateByTenant(String code, Long newTenantId) {
+        return baseMapper.getCertificateByTenant(code,newTenantId);
+    }
 }

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

@@ -110,6 +110,11 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
         return this.removeByIds(ids);
     }
 
+    @Override
+    public Certificate getCertificateByTenant(String code, Long newTenantId) {
+        return baseMapper.getCertificateByTenant(code,newTenantId);
+    }
+
     private boolean checkNameUnique(Certificate entity) {
         Certificate info = getOne(new LambdaQueryWrapper<Certificate>()
                 .eq(Certificate::getCertificateName,entity.getCertificateName()).ne(Certificate::getStatus,-1)

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

@@ -690,4 +690,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public CertificateTp getCertificateTpByTenant(String code, Long newTenantId) {
+        return baseMapper.getCertificateTpByTenant(code, newTenantId);
+    }
 }

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

@@ -70,4 +70,7 @@ private static final long serialVersionUID=1L;
     /** 1显示 0隐藏 */
     private Integer courseShow;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

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

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

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

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

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

@@ -45,4 +45,7 @@ private static final long serialVersionUID=1L;
     private Integer sort;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -51,4 +51,7 @@ private static final long serialVersionUID=1L;
     private Integer canDownload;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

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

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

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

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

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

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

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

@@ -60,4 +60,6 @@ private static final long serialVersionUID=1L;
     private Long polyvId;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

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

@@ -44,4 +44,6 @@ private static final long serialVersionUID=1L;
     private Integer sort;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

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

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

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +16,6 @@ import java.util.List;
 public interface CourseChapterBusinessMapper extends BaseMapper<CourseChapterBusiness> {
     List<CourseChapterBusiness> getListById(Long id);
 
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,12 +1,14 @@
 package com.zhongzheng.modules.course.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseChapterQueryBo;
 import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapter;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import com.zhongzheng.modules.course.vo.CourseSectionVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,4 +21,7 @@ import java.util.List;
 public interface CourseChapterMapper extends BaseMapper<CourseChapter> {
     List<CourseChapterVo> selectListByBo(CourseChapterQueryBo bo);
     CourseChapterVo getInfo(Long chapterId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseChapter getChapterByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
@@ -45,4 +46,7 @@ public interface CourseChapterSectionMapper extends BaseMapper<CourseChapterSect
 
     Long getStudyDuration(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
                           @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("chapterId") Long chapterId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.zhongzheng.modules.base.vo.BaseFilterVo;
 import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -18,5 +19,6 @@ public interface CourseEducationTypeMapper extends BaseMapper<CourseEducationTyp
    List<CourseEducationTypeVo> selectUserEduList(@Param("userId") Long userId,@Param("goodsType") Integer goodsType);
    List<BaseFilterVo> selectUserAllBusinessList(@Param("userId") Long userId);
 
+    @InterceptorIgnore(tenantLine = "true")
     CourseEducationType getEducationTypeBytenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
 }

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

@@ -56,4 +56,7 @@ public interface CourseMapper extends BaseMapper<Course> {
     Long checkCourseHaveStudy(@Param("courseId") Long courseId);
 
     List<ClassGradeVo> gradeIdUserSelect(@Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Course getCourseByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenuExam;
 import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ import java.util.List;
  */
 public interface CourseMenuExamMapper extends BaseMapper<CourseMenuExam> {
     List<CourseMenuExamVo> getList(CourseMenuExamQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenu;
@@ -35,4 +36,7 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
     Integer auditCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
 
     List<CourseUserMenuVo> getGoodsMenuList(CourseMenuQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdTenant(@Param("newCourseId") Long newCourseId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,4 +15,7 @@ import java.util.List;
  */
 public interface CourseModuleBusinessMapper extends BaseMapper<CourseModuleBusiness> {
     List<CourseModuleBusiness> getListById(Long moduleId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("moduleId") Long moduleId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.domain.CourseModuleChapter;
@@ -22,10 +23,13 @@ public interface CourseModuleChapterMapper extends BaseMapper<CourseModuleChapte
 
     List<CourseUserModuleChapterVo> chapterList(CourseMenuQueryBo bo);
 
-    Integer rebuildChapterCheck(@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
+    Integer rebuildChapterCheck(@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("examId") Long examId);
 
     List<CourseUserModuleChapterVo> examList(CourseMenuQueryBo bo);
 
     Integer learningExamCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
                               @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("newModuleId") Long newModuleId,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,12 +1,14 @@
 package com.zhongzheng.modules.course.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseChapterQueryBo;
 import com.zhongzheng.modules.course.bo.CourseModuleQueryBo;
 import com.zhongzheng.modules.course.domain.CourseModule;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import com.zhongzheng.modules.course.vo.CourseModuleVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +20,7 @@ import java.util.List;
  */
 public interface CourseModuleMapper extends BaseMapper<CourseModule> {
     List<CourseModuleVo> selectListByBo(CourseModuleQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseModule getModuleByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,8 +1,10 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
 import com.zhongzheng.modules.course.vo.CourseSectionBusinessVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ import java.util.List;
 public interface CourseSectionBusinessMapper extends BaseMapper<CourseSectionBusiness> {
     List<CourseSectionBusiness> getListById(Long id);
 
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdAndTenant(@Param("sectionId") Long sectionId,@Param("newTenantId")  Long newTenantId);
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
 import com.zhongzheng.modules.course.domain.CourseSection;
@@ -26,4 +27,7 @@ public interface CourseSectionMapper extends BaseMapper<CourseSection> {
     Long checkUserHaveLiveGoods(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
 
     Long checkCrossLiveTime(@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("sectionId") Long sectionId,@Param("liveUrl") String liveUrl);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseSection getSectionByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,11 +1,14 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.course.vo.CourseSubjectVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,4 +28,7 @@ public interface CourseSubjectMapper extends BaseMapper<CourseSubject> {
     List<CourseProjectTypeVo> queryProject(Long id);
 
     Integer countNum(CourseSubjectQueryBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseSubject getSubjectByTenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.zhongzheng.modules.course.domain.MajorProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 科目绑定项目Mapper接口
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MajorProjectMapper extends BaseMapper<MajorProject> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    void deleteByIdTenant(@Param("newMajorId") Long newMajorId,@Param("newTenantId") Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterBusinessService.java

@@ -52,4 +52,6 @@ public interface ICourseChapterBusinessService extends IService<CourseChapterBus
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void deleteByIdAndTenant(Long chapterId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterSectionService.java

@@ -60,4 +60,6 @@ public interface ICourseChapterSectionService extends IService<CourseChapterSect
     List<CourseUserChapterSectionVo> sectionList(CourseMenuQueryBo bo);
 
 	List<CourseUserChapterSectionVo> sectionExamList(CourseMenuQueryBo bo);
+
+    void deleteByIdAndTenant(Long chapterId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterService.java

@@ -58,4 +58,6 @@ public interface ICourseChapterService extends IService<CourseChapter> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean batchDelChapter(GoodsBatchDelBo bo);
+
+    CourseChapter getChapterByTenant(String code, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseMenuExamService.java

@@ -51,4 +51,6 @@ public interface ICourseMenuExamService extends IService<CourseMenuExam> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void deleteByIdTenant(Long newCourseId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseMenuService.java

@@ -64,4 +64,6 @@ public interface ICourseMenuService extends IService<CourseMenu> {
 	 * @return java.util.List<com.zhongzheng.modules.course.vo.CourseUserMenuVo>
 	 */
 	List<CourseUserMenuVo> getGoodsRebuildMenuList(CourseMenuQueryBo bo);
+
+    void deleteByIdTenant(Long newCourseId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseModuleBusinessService.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.course.bo.CourseModuleBusinessAddBo;
 import com.zhongzheng.modules.course.bo.CourseModuleBusinessEditBo;
 import com.zhongzheng.modules.course.bo.CourseModuleBusinessQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
+import com.zhongzheng.modules.course.domain.CourseModule;
 import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
 import com.zhongzheng.modules.course.vo.CourseModuleBusinessVo;
 
@@ -52,4 +53,6 @@ public interface ICourseModuleBusinessService extends IService<CourseModuleBusin
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void deleteByIdAndTenant(Long moduleId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseModuleChapterService.java

@@ -54,4 +54,6 @@ public interface ICourseModuleChapterService extends IService<CourseModuleChapte
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<CourseUserModuleChapterVo> chapterList(CourseMenuQueryBo bo);
+
+    void deleteByIdAndTenant(Long newModuleId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseModuleService.java

@@ -54,4 +54,6 @@ public interface ICourseModuleService extends IService<CourseModule> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean batchDelModule(GoodsBatchDelBo bo);
+
+    CourseModule getModuleByTenant(String code, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSectionBusinessService.java

@@ -53,4 +53,6 @@ public interface ICourseSectionBusinessService extends IService<CourseSectionBus
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void deleteByIdAndTenant(Long sectionId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSectionService.java

@@ -77,4 +77,6 @@ public interface ICourseSectionService extends IService<CourseSection> {
 	List<LiveGetMessageListResponse.MessageList> GetHistoryChatMsg(CourseSectionQueryBo bo) throws IOException, NoSuchAlgorithmException;
 
     boolean batchDelSection(GoodsBatchDelBo bo);
+
+    CourseSection getSectionByTenant(String code, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseService.java

@@ -85,4 +85,6 @@ public interface ICourseService extends IService<Course> {
 	List<ClassGradeVo> gradeIdUserSelect(Long goodsId, Long gradeId);
 
 	List<GoodsUserVo> goodsProgressList(CourseQueryBo bo);
+
+    Course getCourseByTenant(String code, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectService.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.service;
 
+import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
@@ -51,4 +52,6 @@ public interface ICourseSubjectService extends IService<CourseSubject> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<CourseSubjectVo> queryListAll(CourseSubjectQueryBo bo);
+
+	CourseSubject getSubjectByTenant(String encoder, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorProjectService.java

@@ -49,4 +49,6 @@ public interface IMajorProjectService extends IService<MajorProject> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void deleteByIdTenant(Long newMajorId, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterBusinessServiceImpl.java

@@ -106,4 +106,9 @@ public class CourseChapterBusinessServiceImpl extends ServiceImpl<CourseChapterB
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long chapterId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(chapterId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -153,7 +153,8 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
         if (bo.getUserId() != null) {
             for (CourseUserChapterSectionVo courseMenuVo : courseUserChapterSectionVos) {
                 if (courseMenuVo.getType().equals(1)) {
-                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L,bo.getCourseId());
+                    //节
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), null,bo.getCourseId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
@@ -161,13 +162,14 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (audit > 0) {
                         courseMenuVo.setAudit(1L);
                     }
-                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L,bo.getCourseId());
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), null,bo.getCourseId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);
                     }
                     Long studyDuration = baseMapper.getStudyDuration(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L,bo.getCourseId());
                     courseMenuVo.setStudyDuration(studyDuration);
                 } else {
+                    //章卷
                     Integer rebuild = baseMapper.rebuildCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId(),bo.getCourseId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
@@ -203,4 +205,9 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
         }
         return examList;
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long chapterId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(chapterId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java

@@ -220,6 +220,11 @@ public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, C
                 .in(CourseChapter::getChapterId,bo.getIds()));
     }
 
+    @Override
+    public CourseChapter getChapterByTenant(String code, Long newTenantId) {
+        return baseMapper.getChapterByTenant(code, newTenantId);
+    }
+
     private boolean checkNameUnique(CourseChapter entity) {
         CourseChapter info = getOne(new LambdaQueryWrapper<CourseChapter>()
                 .eq(CourseChapter::getPrefixName,entity.getPrefixName()).eq(CourseChapter::getName,entity.getName()).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuExamServiceImpl.java

@@ -111,4 +111,9 @@ public class CourseMenuExamServiceImpl extends ServiceImpl<CourseMenuExamMapper,
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdTenant(Long newCourseId, Long newTenantId) {
+        baseMapper.deleteByIdTenant(newCourseId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -320,4 +320,9 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         }
         return courseMenuVos;
     }
+
+    @Override
+    public void deleteByIdTenant(Long newCourseId, Long newTenantId) {
+        baseMapper.deleteByIdTenant(newCourseId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleBusinessServiceImpl.java

@@ -6,6 +6,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.CourseModuleBusinessAddBo;
 import com.zhongzheng.modules.course.bo.CourseModuleBusinessEditBo;
 import com.zhongzheng.modules.course.bo.CourseModuleBusinessQueryBo;
+import com.zhongzheng.modules.course.domain.CourseModule;
 import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
 import com.zhongzheng.modules.course.mapper.CourseModuleBusinessMapper;
 import com.zhongzheng.modules.course.service.ICourseModuleBusinessService;
@@ -105,4 +106,9 @@ public class CourseModuleBusinessServiceImpl extends ServiceImpl<CourseModuleBus
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long moduleId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(moduleId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleChapterServiceImpl.java

@@ -124,18 +124,28 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
             courseUserModuleChapterVos.addAll(examList);
         }
 
-        //获得重修目录
-        if (bo.getRebuild() != null && bo.getRebuild() == 1){
-            for (CourseUserModuleChapterVo courseUserModuleChapterVo : courseUserModuleChapterVos) {
-                if (courseUserModuleChapterVo.getModuleId() == null){
-                    bo.setModuleId(0L);
-                }
+        for (CourseUserModuleChapterVo courseUserModuleChapterVo : courseUserModuleChapterVos) {
+            if (courseUserModuleChapterVo.getModuleId() == null){
+                bo.setModuleId(0L);
+            }
+            if(courseUserModuleChapterVo.getType()==1){
                 //查询章是否重修章
-                Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),courseUserModuleChapterVo.getChapterId(), courseUserModuleChapterVo.getGradeId(), bo.getUserId());
+                Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),courseUserModuleChapterVo.getChapterId(), courseUserModuleChapterVo.getGradeId(), bo.getUserId(),null);
+                if (rebuild > 0) {
+                    courseUserModuleChapterVo.setRebuild(1);
+                }
+            }
+            if(courseUserModuleChapterVo.getType()==2){
+                //查询模块卷是否重修
+                Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),null, courseUserModuleChapterVo.getGradeId(), bo.getUserId(),courseUserModuleChapterVo.getTypeId());
                 if (rebuild > 0) {
                     courseUserModuleChapterVo.setRebuild(1);
                 }
             }
+
+        }
+        //获得重修目录
+        if (bo.getRebuild() != null && bo.getRebuild() == 1){
             List<CourseUserModuleChapterVo> courseUserModuleChapterVoList = courseUserModuleChapterVos.stream().filter(s ->
                     s.getRebuild() != null && s.getRebuild().equals(1)
             ).collect(Collectors.toList());
@@ -144,4 +154,9 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
         }
         return courseUserModuleChapterVos;
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long newModuleId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(newModuleId, newTenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleServiceImpl.java

@@ -209,6 +209,11 @@ public class CourseModuleServiceImpl extends ServiceImpl<CourseModuleMapper, Cou
                 .in(CourseModule::getModuleId,bo.getIds()));
     }
 
+    @Override
+    public CourseModule getModuleByTenant(String code, Long newTenantId) {
+        return baseMapper.getModuleByTenant(code,newTenantId);
+    }
+
     private boolean checkNameUnique(CourseModule entity) {
         CourseModule info = getOne(new LambdaQueryWrapper<CourseModule>()
                 .eq(CourseModule::getPrefixName,entity.getPrefixName()).eq(CourseModule::getModuleName,entity.getModuleName()).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionBusinessServiceImpl.java

@@ -106,4 +106,9 @@ public class CourseSectionBusinessServiceImpl extends ServiceImpl<CourseSectionB
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void deleteByIdAndTenant(Long sectionId, Long newTenantId) {
+        baseMapper.deleteByIdAndTenant(sectionId, newTenantId);
+    }
 }