图片上传

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java

@@ -27,6 +27,7 @@
 	import com.ruoyi.wgz.bo.rests.WgzAutonymAnnex;
 	import com.ruoyi.wgz.bo.req.*;
 	import com.ruoyi.wgz.domain.WgzAttendance;
+	import com.ruoyi.wgz.domain.WgzMessage;
 	import com.ruoyi.wgz.domain.WgzPayCalculation;
 	import com.ruoyi.wgz.domain.WgzQuestionsConfiguration;
 	import com.ruoyi.wgz.service.*;
@@ -554,6 +555,16 @@
 			return iWgzMessageService.userGetMessageList(req);
 		}
 
+		/**
+		 * 【消息】【报名消息】 系统消息详情
+		 */
+		@ApiOperation("【消息】【报名消息】 系统消息详情")
+		//@PreAuthorize("@ss.hasPermi('wgzApp:user:userRegistrationInformation')")
+		@GetMapping("/WgzAppUserSystemMessageDetails/{messageId}")
+		public AjaxResult<WgzMessage> userSystemMessageDetails(@NotNull(message = "消息主键ID不能为空") @PathVariable("messageId") Long messageId) {
+			return AjaxResult.success(iWgzMessageService.queryById(messageId));
+		}
+
 		/**
 		 * 【消息】【报名消息】 报名消息
 		 */
@@ -602,11 +613,16 @@
 			Long appUserId = SecurityUtils.getAppUserId();
 			Long recruitId;
 			if (req.getType()==1){
-				BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
-				recruitId = by.getRecruitId();
-//				if (!appUserId.equals(recruitId)){
-//					throw new RuntimeException("当前用户不是该招工的申请人");
-//				}
+				//指定项目
+				Long zhaoGongId = req.getZhaoGongId();
+				if (zhaoGongId!=null && zhaoGongId > 0){
+					recruitId = zhaoGongId;
+				}
+				//系统默认当前项目
+				else{
+					BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+					recruitId = by.getRecruitId();
+				}
 			} else {
 				recruitId = 0L;
 			}