优化

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -115,15 +115,15 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
         WelcomeStudent student = welcomeStudentService.getManageById(irp.getId());
 
-        if(student == null){
+        if (student == null) {
             return CommonResult.fail("学生信息已失效，无法添加备注");
         }
 
-        if(student.getIsRegistered().intValue() == 1){
+        if (student.getIsRegistered().intValue() == 1) {
             return CommonResult.fail("已报到学生无法添加备注");
         }
 
-        student.setRemark(student.getRemark()+""+TimeExchange.getTime()+":"+irp.getRemark()+"；");
+        student.setRemark((StringUtils.hasText(student.getRemark()) ? student.getRemark()+"\n" : "") + "" + TimeExchange.getTime() + ":" + irp.getRemark() + "；");
 
         int result = welcomeStudentService.updateWelcomeStudent(student);
 
@@ -600,10 +600,10 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 }
                 if (ids != null && ids.size() > 0) {
                     List<WelcomeStudent> studentDatas = welcomeStudentService.queryStudents(ids);
-                    if(studentDatas != null && studentDatas.size() > 0){
-                        for (WelcomeStudent ws:studentDatas){
+                    if (studentDatas != null && studentDatas.size() > 0) {
+                        for (WelcomeStudent ws : studentDatas) {
                             Optional<PayDetailsVo> opdv = pdvs.stream().filter(e -> e.getId().intValue() == ws.getId().intValue()).findFirst();
-                            if(opdv != null && opdv.isPresent()){
+                            if (opdv != null && opdv.isPresent()) {
                                 ws.setAmountPayable(opdv.get().getAmountPayable());
                                 ws.setPayAmount(opdv.get().getPayAmount());
                             }