diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java index fed3ed64..ad3a7392 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java @@ -3,8 +3,12 @@ package com.jero.modules.projectLibrary.controller; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.projectLibrary.common.AssessCommon; import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -116,13 +120,20 @@ public class LawsEvaluationNotMetController extends JeroController ids) { Date date = new Date(); + LoginUser loginUser = CurrentUserUtil.getLoginUser(); + String roleIds = loginUser.getRoleIds(); + String userId = loginUser.getId(); List notMets = lawsEvaluationNotMetService.listByIds(ids); for (LawsEvaluationNotMet notMet : notMets) { + //管理员和设计工程师可以操作未符合项 + if (!roleIds.contains(FieldCommon.ROLE_ADMIN) || !userId.equals(notMet.getEngineerId())){ + throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); + } String state = notMet.getState(); Date expectedTime = notMet.getExpectedTime(); // 判断expectedTime是否小于今日 boolean isLessThanToday = expectedTime.before(date); - if (!state.equals("1") || !isLessThanToday){ + if (!state.equals(AssessCommon.TO_BE_RECTIFIED) || !isLessThanToday){ return false; } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index 71a7f519..85a59c2e 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -5,7 +5,11 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.CommonConstant; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; @@ -164,6 +168,15 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl