Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoController.java

@@ -288,6 +288,13 @@ public class WishInfoController {
 
             int wishInfoUserRecordNum = wishInfoUserRecordService.countByWishAndStatus(wishInfo.getId(),"1");
             wishInfo.setWishInfoUserRecordNum(wishInfoUserRecordNum);
+
+            if(StringUtils.isNotEmpty(wishInfo.getImage())){
+                String img = wishInfo.getImage()+"?x-oss-process=image/resize,m_lfit,h_300,w_300";
+                wishInfo.setImage(img);
+            }
+
+
         }
 
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoUserRecordController.java

@@ -117,12 +117,14 @@ public class WishInfoUserRecordController {
 
                 if(regUser!=null){
                     wishInfoUserRecord.setRegUserName(regUser.getRealName());
+                    wishInfoUserRecord.setRegUserPhone(regUser.getPhone());
                 }
 
                 if(StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())){
                     StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
                     if(studentAspirations!=null){
                         wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
+                        wishInfoUserRecord.setStudentName(studentAspirations.getStudentName());
                     }
                 }
 
@@ -335,7 +337,7 @@ public class WishInfoUserRecordController {
 
             WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
             if(wishInfo!=null){
-                wishInfoUserRecord.setStudentName(wishInfo.getStudentName());
+
                 wishInfoUserRecord.setStudentType(wishInfo.getStudentType());
                 wishInfoUserRecord.setWishInfoTitle(wishInfo.getTitle());
 
@@ -350,6 +352,7 @@ public class WishInfoUserRecordController {
                 StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
                 if(studentAspirations!=null){
                     wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
+                    wishInfoUserRecord.setStudentName(studentAspirations.getStudentName());
                 }
             }