yonge 3 년 전
부모
커밋
2ee353c2db

+ 0 - 3
mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -513,9 +513,6 @@
             <if test="status!=null">
                 AND status_=#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
-            <if test="tenantId!=null">
-                AND cgsm.tenant_id_=#{tenantId}
-            </if>
         </where>
     </select>
     <select id="getStudentEducationalTeachers" resultType="com.ym.mec.biz.dal.dto.StudentEduTeacherDto">

+ 11 - 8
mec-web/src/main/java/com/ym/mec/web/controller/AppRedemptionCodeController.java

@@ -1,17 +1,21 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.AppRedemptionCode;
 import com.ym.mec.biz.service.AppRedemptionCodeService;
-import com.ym.mec.common.entity.HttpResponseResult;
-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.*;
 import com.ym.mec.common.controller.BaseController;
-
-import javax.annotation.Resource;
+import com.ym.mec.common.entity.HttpResponseResult;
 
 /**
  * 兑换码分配表(RedemptionCode)表控制层
@@ -33,7 +37,6 @@ public class AppRedemptionCodeController extends BaseController {
 
     @ApiOperation(value = "分配url")
     @GetMapping(value = "allocation")
-    @PreAuthorize("@pcs.hasPermissions('appRedemptionCode/allocation')")
     public HttpResponseResult<AppRedemptionCode> allocation(@RequestParam("userId")Integer userId) throws Exception {
         if (userId == null) {
             throw new Exception("用户Id必须填写");