能力申请v3-bug fix
This commit is contained in:
parent
f4939b34f4
commit
30b5ee12f0
|
@ -285,11 +285,11 @@ public class AbilityCenterControllerV3 {
|
||||||
if (applyUserDeptType == 2) {
|
if (applyUserDeptType == 2) {
|
||||||
cityApply = Boolean.TRUE; // 市级部门发起申请
|
cityApply = Boolean.TRUE; // 市级部门发起申请
|
||||||
}
|
}
|
||||||
if (cityApply && resourceDeptType == 2) {
|
if (resourceDeptType == 2) {
|
||||||
cityApplyCity = Boolean.TRUE; // 市区申请市区
|
cityApplyCity = Boolean.TRUE; // 市区申请市区
|
||||||
}
|
}
|
||||||
SysDeptDTO userDept = sysDeptService.get(user.getDeptId());
|
SysDeptDTO userDept = sysDeptService.get(user.getDeptId());
|
||||||
if (!cityApply && (userDept.getDistrict() != sysDeptDTO.getDistrict())) { // 非市申请且发起人与资源所属区县不一致
|
if (!cityApply && !userDept.getDistrict().equals(sysDeptDTO.getDistrict())) { // 非市申请且发起人与资源所属区县不一致
|
||||||
crossRegion = Boolean.TRUE; // 跨区
|
crossRegion = Boolean.TRUE; // 跨区
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue