From 72a6d5a954312a8a53e5bdd18c5f8f8b57b54dbc Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 08 Nov 2023 14:40:58 +0800 Subject: [PATCH] chore:分享权限修改提交 --- screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java index da34292..2f4eace 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java @@ -25,6 +25,7 @@ import com.moral.api.pojo.query.app.AppAllocationPageCond; import com.moral.api.pojo.vo.allocation.AllocationFindVo; import com.moral.api.pojo.vo.app.AppAllocationFindVo; +import com.moral.api.pojo.vo.app.AppAuthority; import com.moral.api.pojo.vo.user.QxUser; import com.moral.api.service.*; import com.moral.constant.Constants; @@ -845,7 +846,9 @@ } @Override - public Integer authority(String allocationNum,Integer userId) { + public AppAuthority authority(String allocationNum,Integer userId) { + //������������ + AppAuthority appAuthority = new AppAuthority(); //������������������ QxUser user = UserHelper.getCurrentUser(); //��������������������� @@ -858,27 +861,46 @@ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId()); if(CollectionUtils.isNotEmpty(userList)){ //��������������������� - return 1; + appAuthority.setCode(1); + appAuthority.setName(AppAllocationStateEnum.COMPLETED.name); + return appAuthority; } if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId()); if (code.length() > 6 && allocation.getUnitId().equals(user.getUnitId())) { if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){ - return 1; - }else{ - return 2; + appAuthority.setCode(1); + appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name); + return appAuthority; + }else if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){ + appAuthority.setCode(2); + appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name); + return appAuthority; + }else { + appAuthority.setCode(1); + appAuthority.setName(AppAllocationStateEnum.COMPLETED.name); + return appAuthority; } - } else if (code.length() <= 6){ if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){ - return 1; - }else{ - return 2; + appAuthority.setCode(1); + appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name); + return appAuthority; + }else if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){ + appAuthority.setCode(2); + appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name); + return appAuthority; + }else { + appAuthority.setCode(1); + appAuthority.setName(AppAllocationStateEnum.COMPLETED.name); + return appAuthority; } } } //��������������������� - return 3; + appAuthority.setCode(3); + appAuthority.setName("������������"); + return appAuthority; } @Override -- Gitblit v1.8.0