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-08-25 15:15:36 +08:00
parent 9c01ddfa23 30b5ee12f0
commit 04ed31cd91
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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