脚本修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCardRuleServiceImpl.java

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,14 +21,16 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.EnumResult;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * <p>
@@ -42,9 +43,6 @@ import java.util.*;
 @Service
 public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, BasicCardRule> implements BasicCardRuleService {
 
-    @Resource
-    TeachcloudCommonService teachcloudCommonService;
-
     @Resource
     BasicPrintConfigService basicPrintConfigService;
 
@@ -75,8 +73,9 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
         allExamRuleFieldList.addAll(examRuleRequiredFieldList);
         if (!CollectionUtils.isEmpty(examRuleExtendFieldList)) {
             for (JSONObject jsonObject : examRuleExtendFieldList) {
-                if (jsonObject.getBoolean("enable"))
+                if (jsonObject.getBoolean("enable")) {
                     allExamRuleFieldList.add(jsonObject);
+                }
             }
         }
         List<EnumResult> enumResults = CardRequiredFieldsEnum.listTypes();

distributed-print-business/src/main/resources/db/install/teachcloud_db.sql

@@ -3372,3 +3372,4 @@ INSERT INTO `sys_role_privilege` VALUES (532, 10, 831, 1);
 INSERT INTO `sys_role_privilege` VALUES (533, 10, 575, 1);
 INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
 INSERT INTO `sys_role_privilege` VALUES (535, 10, 832, 1);
+INSERT INTO `sys_role_privilege` VALUES (536, 9, 868, 1);

distributed-print-business/src/main/resources/db/log/脚本-wangl.sql

@@ -31,6 +31,8 @@ INSERT INTO `sys_role_privilege` VALUES (531, 10, 830, 1);
 INSERT INTO `sys_role_privilege` VALUES (532, 10, 831, 1);
 INSERT INTO `sys_role_privilege` VALUES (533, 10, 575, 1);
 INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
+INSERT INTO `sys_role_privilege` VALUES (535, 10, 832, 1);
+INSERT INTO `sys_role_privilege` VALUES (536, 9, 868, 1);
 
 DROP TABLE IF EXISTS `basic_teach_course`;
 CREATE TABLE `basic_teach_course` (

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicRoleDataPermissionServiceImpl.java

@@ -177,6 +177,8 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
                         break;
                     case ALL:
                         break;
+                    default:
+                        break;
                 }
             }
         }

teachcloud-common/src/main/resources/mapper/BasicTeachCourseMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.mapper.BasicTeachCourseMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicTeachCourseMapper">
 
 </mapper>