From 30b5ee12f0025a89bee77f01d5d99ee4d23029ad Mon Sep 17 00:00:00 2001
From: Koi-tsk <337023856@qq.com>
Date: Thu, 25 Aug 2022 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7v3-bug=20fi?=
 =?UTF-8?q?x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/common/controller/AbilityCenterControllerV3.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
index 6a484c4a..3485d09f 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
@@ -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; // 跨区
                     }
                 }