fix 搜索错误

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

@@ -52,24 +52,24 @@ public class ReplacementInstrumentActivityController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityService.findByUserId(user.getId());
-        if(replacementInstrumentActivity == null){
+        if (replacementInstrumentActivity == null) {
             Student student = studentService.get(user.getId());
             replacementInstrumentActivity = new ReplacementInstrumentActivity();
             replacementInstrumentActivity.setUserId(user.getId());
             replacementInstrumentActivity.setClasses(student.getCurrentClass());
-            if(student.getCurrentGradeNum() != null){
+            if (student.getCurrentGradeNum() != null) {
                 replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
             }
             replacementInstrumentActivity.setCooperationOrganId(cooperationOrganId);
-            replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
+            replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername()) ? user.getRealName() : user.getUsername());
             replacementInstrumentActivity.setMobileNo(user.getPhone());
             String subjectIdList = student.getSubjectIdList();
-            if(StringUtils.isNotEmpty(subjectIdList)){
+            if (StringUtils.isNotEmpty(subjectIdList)) {
                 replacementInstrumentActivity.setSubjectId(Integer.parseInt(subjectIdList.split(",")[0]));
             }
         }
         CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
-        if(cooperationOrgan != null){
+        if (cooperationOrgan != null) {
             replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
         }
         return succeed(replacementInstrumentActivity);
@@ -77,7 +77,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @ApiOperation(value = "修改调查问卷")
     @PostMapping("/update")
-    public Object update (ReplacementInstrumentActivity replacementInstrumentActivity) {
+    public Object update(ReplacementInstrumentActivity replacementInstrumentActivity) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败，请重新登陆");
@@ -88,7 +88,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @ApiOperation(value = "获取调查问卷")
     @GetMapping("/get")
-    public Object get (Integer id) {
+    public Object get(Integer id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败，请重新登陆");
@@ -100,5 +100,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @PostMapping("/pay")
     @ApiImplicitParams({@ApiImplicitParam(name = "replacementPayDto", value = "支付参数", required = true, dataType = "ReplacementPayDto")})
     public HttpResponseResult pay(ReplacementPayDto replacementPayDto) throws Exception {
-        return succeed(studentInstrumentService.pay(maintenancePayDto));
+        //return succeed(studentInstrumentService.pay(maintenancePayDto));
+        return null;
     }
+}