Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

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

@@ -68,9 +68,7 @@
 		<if test="updateTime != null">
 		update_time_ = #{updateTime},
 		</if>
-		<if test="instrumentsId != null">
 		instruments_id_ = #{instrumentsId},
-		</if>
 		<if test="mobileNo != null">
 		mobile_no_ = #{mobileNo},
 		</if>

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -63,10 +63,10 @@ public class ReplacementInstrumentActivityController extends BaseController {
             if(StringUtils.isNotEmpty(subjectIdList)){
                 replacementInstrumentActivity.setSubjectId(Integer.parseInt(subjectIdList.split(",")[0]));
             }
-            CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
-            if(cooperationOrgan != null){
-                replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
-            }
+        }
+        CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
+        if(cooperationOrgan != null){
+            replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
         }
         return succeed(replacementInstrumentActivity);
     }