From 31c65cd4f338256b76efebdb2f1f29deb170969f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:01:22 +0800
Subject: [PATCH] chore:权限修改提交
---
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 2 +-
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 9 +++++++--
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 40 +++++++++++++++++++++++++---------------
screen-api/src/main/java/com/moral/api/vo/WxMssVo.java | 2 +-
5 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
index e1d9d2f..38c8675 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
@@ -93,7 +93,7 @@
@ApiOperation(value = "������������")
public ResultMessage authority(@RequestParam @ApiParam(value = "allocationNum",name = "������") String allocationNum,
@RequestParam @ApiParam(value = "userId",name = "������Id") Integer userId){
- boolean authority = allocationService.authority(allocationNum,userId);
+ Integer authority = allocationService.authority(allocationNum, userId);
return ResultMessage.ok(authority);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index abdb545..3bf0d6a 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -133,8 +133,13 @@
*/
void checkSmallRoutine(AllocationCheckCond checkCond);
-
- boolean authority(String allocationNum,Integer userId);
+ /**
+ * ������������ 1 ������������������ 2.������������������ 3.���������
+ * @param allocationNum
+ * @param userId
+ * @return
+ */
+ Integer authority(String allocationNum,Integer userId);
}
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 bf4a59d..47558bc 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
@@ -842,30 +842,40 @@
}
@Override
- public boolean authority(String allocationNum,Integer userId) {
+ public Integer authority(String allocationNum,Integer userId) {
//������������������
QxUser user = UserHelper.getCurrentUser();
+ //���������������������
+ LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Allocation::getAllocationNum,allocationNum);
+ wrapper.eq(Allocation::getIsDel,0);
+ wrapper.eq(Allocation::getIsInvalid,0);
+ Allocation allocation = allocationMapper.selectOne(wrapper);
+
List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
- return true;
+ //���������������������
+ return 1;
}
if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
- LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Allocation::getAllocationNum,allocationNum);
- wrapper.eq(Allocation::getIsDel,0);
- wrapper.eq(Allocation::getIsInvalid,0);
- Allocation allocation = allocationMapper.selectOne(wrapper);
- if (allocation.getUnitId().equals(user.getUnitId())){
- return true;
- }
String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if (code.length() > 6) {
- return false;
- } else {
- return true;
+ if (code.length() > 6 && allocation.getUnitId().equals(user.getUnitId())) {
+ if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ return 1;
+ }else{
+ return 2;
+ }
+
+ } else if (code.length() <= 6){
+ if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ return 1;
+ }else{
+ return 2;
+ }
}
}
- return false;
+ //���������������������
+ return 3;
}
@Override
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index e721e8b..86fd061 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -285,7 +285,7 @@
wxMssVo.setTemplate_id("YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho");//������������������id
wxMssVo.setLang("zh_CN");
wxMssVo.setMiniprogramState("formal");
-// wxMssVo.setPage("pages/index/index");
+ wxMssVo.setPage("pages/index/index");
Map<String, Object> m = new HashMap<>();
HashMap<String, Object> map1 = new HashMap<>();
HashMap<String, Object> map2 = new HashMap<>();
diff --git a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
index 2520ace..3ad7ea7 100644
--- a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
+++ b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
@@ -8,7 +8,7 @@
public class WxMssVo {
private String touser;//������openid
private String template_id;//������������������id
-// private String page = "pages/index/index";//���������������������������
+ private String page = "pages/index/index";//���������������������������
private Object data;//������������
private String miniprogramState;
private String lang;
--
Gitblit v1.8.0