diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index 28e7aeb..ccdadd6 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -180,7 +180,7 @@ FROM pj_evaluate_details WHERE - post_id = #{deptId} + post_id = #{userDeptId} and person_id = #{userId} diff --git a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html index 26ce6c6..3c80407 100644 --- a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html +++ b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html @@ -164,10 +164,10 @@ } , { field: 'auditStatus', align: 'center', title: '审核状态', templet:function(d){ - if(d.auditState==='4' || d.auditState===4){ + if(d.rejectReason){ return '已驳回' }else{ - return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价')) + return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价')) } } }