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

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityPlanController.java

@@ -120,7 +120,7 @@ public class ActivityPlanController extends BaseController {
      */
     @PostMapping("/saveOrUpdateReward")
     @ApiOperation(value = "修改奖品")
-    @PreAuthorize("@pcs.hasPermissions('activityPlan/updateReward')")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/saveOrUpdateReward')")
     public HttpResponseResult saveOrUpdateReward(@Validated @RequestBody List<ActivityPlanRewardDto> updateRewardDtoList) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -102,7 +102,7 @@ public class ActivityRewardController extends BaseController {
      */
     @GetMapping("/updateStatus")
     @ApiOperation(value = "启用/停用")
-    @PreAuthorize("@pcs.hasPermissions('activityPlan/updateStatus')")
+    @PreAuthorize("@pcs.hasPermissions('activityReward/updateStatus')")
     public HttpResponseResult updateStatus(
             @ApiParam(value = "活动id", required = true) @RequestParam("id") Long id,
             @ApiParam(value = "活动状态 0 停用 1 启用", required = true) @RequestParam("status") Integer status) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -102,8 +102,8 @@ public class TeacherController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"老师编号", "昵称", "姓名", "手机号", "老师类型",
                     "注册时间", "认证时间", "状态", "是否是会员", "徽章"}, new String[]{
-                    "userId", "username", "realName", "phone", "teacherType.equals('ENTRY') ? '达人' : '游客'", "createTime", "entryAuthDate",
-                    "lockFlag.remark", "isVip ? '是' : '否'", "tag"}, rows);
+                    "userId", "username", "realName", "phone", "entryFlag.code == 1 ? '达人' : '游客'", "createTime", "entryAuthDate",
+                    "lockFlag.remark", "isVip.code == 1 ? '是' : '否'", "tag"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=老师列表-" + DateUtil.getDate(new Date()) + ".xls");

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -85,6 +85,7 @@
                 AND (
                 t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
                 u.username_ LIKE CONCAT('%', #{param.search}, '%') or
+                u.real_name_ LIKE CONCAT('%', #{param.search}, '%') or
                 u.phone_ LIKE CONCAT('%', #{param.search}, '%')
                 )
             </if>