wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-02 14:22:50 +08:00
parent 6bd39f39bd 606757b31e
commit 938301a081
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
View File

@ -282,14 +282,14 @@ public class AbilityCenterControllerV3 {
SysDeptDTO applyUserDeptDTO = sysDeptService.get(user.getDeptId()); // 发起人的部门
Integer applyUserDeptType = applyUserDeptDTO.getType(); // 发起人
Integer resourceDeptType = sysDeptDTO.getType(); // 资源所属部门
if (applyUserDeptType == 2) {
if (applyUserDeptType != null && applyUserDeptType == 2) {
cityApply = Boolean.TRUE; // 市级部门发起申请
}
if (resourceDeptType == 2) {
if (resourceDeptType != null && resourceDeptType == 2) {
cityApplyCity = Boolean.TRUE; // 市区申请市区
}
SysDeptDTO userDept = sysDeptService.get(user.getDeptId());
if (!cityApply && !userDept.getDistrict().equals(sysDeptDTO.getDistrict())) { // 非市申请且发起人与资源所属区县不一致
if (!cityApply && !userDept.getDistrict().equals(sysDeptDTO.getDistrict()) && userDept.getDistrict() != null) { // 非市申请且发起人与资源所属区县不一致
crossRegion = Boolean.TRUE; // 跨区
}
}