Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/RedemptionCodeDao.java

@@ -19,5 +19,7 @@ public interface RedemptionCodeDao extends BaseMapper<AppRedemptionCode> {
     AppRedemptionCode findFirstNull();
 
     Integer findNull();
+
+    AppRedemptionCode getByUserId(@Param("userId") Integer userId);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/AppRedemptionCodeServiceImpl.java

@@ -106,7 +106,12 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
 
     @Override
     public AppRedemptionCode allocation(Integer userId) {
-        AppRedemptionCode redemptionCode = redemptionCodeDao.findFirstNull();
+        AppRedemptionCode redemptionCode = redemptionCodeDao.getByUserId(userId);
+        if (redemptionCode != null) { // 如果有由直接返回， 不在分配
+            redemptionCode.setStatus("用户已分配");
+            return redemptionCode;
+        }
+        redemptionCode = redemptionCodeDao.findFirstNull();
         if (redemptionCode == null) {
             return null;
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5332,6 +5332,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//获取所有的更改记录
 		Map<String,Object> param = new HashMap(1);
 		param.put("courseScheduleId",courseScheduleId);
+		Integer tenantId = TenantContextHolder.getTenantId();
+		param.put("tenantId", tenantId);
 		List<CourseScheduleModifyLog> scheduleModifyLogs = courseScheduleModifyLogDao.findAll(param);
 		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
 		for (CourseScheduleModifyLog modifyLog : scheduleModifyLogs) {

mec-biz/src/main/resources/config/mybatis/RedemptionCodeMapper.xml

@@ -29,9 +29,14 @@
         order by rc.import_time_ desc
         limit 1 for update;
     </select>
+
     <select id="findNull" resultType="java.lang.Integer">
         select count(1) from app_redemption_code rc where rc.user_id_ is null
     </select>
 
+    <select id="getByUserId" resultType="com.ym.mec.biz.dal.entity.AppRedemptionCode">
+        select * from app_redemption_code where user_id_ = #{userId}
+    </select>
+
 
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantConfigController.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +23,6 @@ public class TenantConfigController extends BaseController {
 
 	@ApiOperation("修改机构启用停用状态")
 	@GetMapping(value = "/get")
-	@PreAuthorize("@pcs.hasPermissions('tenantConfig/get')")
 	public Object get() {
 		// 查询云教室扣费标准
 		TenantConfig tenantConfig = tenantConfigService.queryByTenantId(TenantContextHolder.getTenantId());