commit

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java

@@ -7,8 +7,11 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.dayofficework.ghkh.model.ExamConfig;
 import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_record;
 import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zb;
@@ -67,6 +70,10 @@ public class GhkhKhphController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
+		boolean isAdmin = AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name());
+		if(!isAdmin) {
+			cnd.and("re.union_id", "=", SecurityUtil.getUnionId());
+		}
         cnd.and("re.zb_id ", "=", khid);
         cnd.and("re.state", "=", 3);
         cnd.andEX("zb.`annual`","=",annual);
@@ -114,6 +121,10 @@ public class GhkhKhphController {
                 $condition
                 """);
 		Cnd cnd = Cnd.NEW();
+		boolean isAdmin = AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name());
+		if(!isAdmin) {
+			cnd.and("re.union_id", "=", SecurityUtil.getUnionId());
+		}
 		cnd.and("re.zb_id ", "=", khid);
 		cnd.and("re.state", "=", 3);
 		cnd.andEX("zb.`annual`","=",annual);

src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html

@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
                                      show-overflow-tooltip
                                      align="center" sortable>
                         <template scope="scope">
-                            <div>
+                            <div v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
                                 <div v-if="rowDataEdit && rowDataIndex==scope.$index">
                                     <el-input placeholder="请输入线下得分"
                                               autofocus
@@ -66,6 +66,9 @@ layout("/layouts/platform.html"){
                                     <i class="el-icon-edit" style="color: #0a84ff"></i>
                                 </div>
                             </div>
+                            <div v-else>
+                                {{scope.row.offLineScore}}
+                            </div>
                         </template>
                     </el-table-column>
                     <el-table-column :label="'线下最终得分' + (examConfig.offLine ? '（' + examConfig.offLine + '%）' : '')" prop="offLineFinalScore" header-align="center"

src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html

@@ -628,12 +628,12 @@ layout("/layouts/platform.html"){
                 }
                 // 考核还没结束
                 if(this.$moment().isBefore(this.$moment(row.endDateTime))) {
-                    if(row.state === 3) {
+                    if(row.state === 2 || row.state === 3) {
                         this.$message.error("当前时间未在申诉期内，不能修改")
                         return
                     }
                 } else if(this.$moment().isAfter(this.$moment(row.endDateTime)) && this.$moment().isBefore(this.$moment(row.startApplyTime))) {
-                    if(row.state === 3) {
+                    if(row.state === 2 || row.state === 3) {
                         this.$message.error("当前时间未在申诉期内，不能修改")
                         return
                     }