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/config/ResourceServerConfig.java

@@ -25,8 +25,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				// .authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
-				.authorizeRequests().antMatchers("/task/**").permitAll()
+				.authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
+				// .authorizeRequests().antMatchers("/task/**").permitAll()
 				.antMatchers("/v2/api-docs", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/uploadFile","/open/**").permitAll().anyRequest().authenticated()
 				.and().httpBasic();
 	}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityRegistrationVo.java

@@ -33,6 +33,17 @@ public class ActivityRegistrationVo extends ActivityRegistration{
 	@ApiModelProperty(value = "是否获奖")
 	private Boolean rewardFlag;
 
+	@ApiModelProperty("真实姓名")
+	private String realName;
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
 	public Long getStudentId() {
 		return studentId;
 	}

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

@@ -30,7 +30,7 @@
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo">
 		SELECT
         	<include refid="baseColumns" />,
-		    u.id_ as studentId,u.username_ as username,u.phone_ as phone,
+		    u.id_ as studentId,u.username_ as username,u.phone_ as phone,u.real_name_ as realName,
             <if test="param.activityType != null and param.activityType.code == 'EVALUATION'">
                 b.music_sheet_name_ as musicSheetName,b.max_score_ as maxScore,b.num_ as num,
             </if>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -106,6 +106,9 @@ public class MusicSheetController extends BaseController {
         query.setCreateBy(sysUser.getId());
         if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {
             query.setState(YesOrNoEnum.YES);
+        } else if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
+            query.setState(YesOrNoEnum.NO);
+            query.setAuditStatus(AuthStatusEnum.PASS);
         }
         query.setSourceType(SourceTypeEnum.TEACHER);
         query.setMyself(true);