From ffb9803bf3db1d2e988c7f8ebbd87cde514f38ef Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Tue, 2 Dec 2025 13:01:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8E=A5=E5=8F=A3=202.=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B6=B3=E8=BF=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppSkillController.java    | 26 +++++++++++++++++++
 .../mapper/app/AppReviewJobMapper.xml         | 12 ++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java
index 4c38083..511d519 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java
@@ -6,6 +6,8 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.AppSkill;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.SiteSecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -57,6 +59,15 @@ public class AppSkillController extends BaseController {
     @ApiOperation("新增技能信息")
     @PostMapping("/add")
     public AjaxResult save(@RequestBody AppSkill appSkill){
+        if(StringUtils.isEmpty(appSkill.getName())){
+            return AjaxResult.error("技能名称为空!");
+        }
+        if(StringUtils.isEmpty(appSkill.getLevels())){
+            return AjaxResult.error("技能等级为空!");
+        }
+        if(appSkill.getUserId()==null){
+            appSkill.setUserId(SiteSecurityUtils.getUserId());
+        }
         return toAjax(appSkillService.insertAppskill(appSkill));
     }
 
@@ -66,6 +77,18 @@ public class AppSkillController extends BaseController {
     @ApiOperation("修改技能详细信息")
     @PutMapping("/edit")
     public AjaxResult update(@RequestBody AppSkill appSkill){
+        if(appSkill.getId()==null){
+            return AjaxResult.error("技能id为空!");
+        }
+        if(StringUtils.isEmpty(appSkill.getName())){
+            return AjaxResult.error("技能名称为空!");
+        }
+        if(StringUtils.isEmpty(appSkill.getLevels())){
+            return AjaxResult.error("技能等级为空!");
+        }
+        if(appSkill.getUserId()==null){
+            appSkill.setUserId(SiteSecurityUtils.getUserId());
+        }
         return toAjax(appSkillService.updateAppskillById(appSkill));
     }
 
@@ -75,6 +98,9 @@ public class AppSkillController extends BaseController {
     @ApiOperation("删除技能详细信息")
     @DeleteMapping("/{id}")
     public AjaxResult delete(@ApiParam("主键id") @PathVariable Long id){
+        if(id==null){
+            return AjaxResult.error("参数id未传递!");
+        }
         return toAjax(appSkillService.removeAppskillIds(new Long[]{id}));
     }
 
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml
index 1fcef50..d065018 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml
@@ -44,11 +44,21 @@
     </select>
 
     <select id="selectAppReviewJobListJob" parameterType="AppReviewJob" resultType="com.ruoyi.cms.domain.Job">
-        select b.*,a.review_date as shareTime from app_review_job a inner join job b on a.job_id=b.job_id and b.del_flag='0'
+        select distinct b.*,a.review_date as shareTime from app_review_job a inner join job b on a.job_id=b.job_id and b.del_flag='0'
+        inner join (select user_id, job_id, max(review_date) as max_review_date from app_review_job
+        where del_flag = '0'
+        <if test="jobId != null ">and job_id = #{jobId}</if>
+        <if test="userId != null ">and user_id = #{userId}</if>
+        group by user_id, job_id
+        ) as max_date
+        on a.user_id = max_date.user_id
+        and a.job_id = max_date.job_id
+        and a.review_date = max_date.max_review_date
         <where>  a.del_flag = '0'
             <if test="jobId != null "> and a.job_id = #{jobId}</if>
             <if test="userId != null "> and a.user_id = #{userId}</if>
         </where>
+        order by a.review_date desc
     </select>
 
 </mapper>
\ No newline at end of file