Просмотр исходного кода

财务分管多部门BUG修复

anderx лет назад: 4
Родитель
Сommit
376cb7b845

+ 1 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -141,7 +141,7 @@ public interface AdminMapper {
 
     Admin selectGetSuper(String aid);
 
-    String getFinanceDep(String aid);
+    List<String> getFinanceDep(String aid);
 
     List<String> getLowerFinanceDep(String aid);
 }

+ 13 - 5
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -31,11 +31,19 @@ public class PushOrderService {
                     return url;
                 }
             } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
-                String depId = adminMapper.getFinanceDep(TokenManager.getAdminId());
-                if (orderDep.equals(depId)) {
-                    return url;
-                } else {
-                    return DEFAULTS_URL;
+                List<String> deps = adminMapper.getFinanceDep(TokenManager.getAdminId());
+                boolean flag = false;
+                for (String dep : deps) {
+                    if (orderDep.equals(deps)) {
+                        flag = true;
+                        break;
+                    }
+                    if (flag) {
+                        return url;
+                    } else {
+                        return DEFAULTS_URL;
+                    }
+
                 }
             } else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
                 List<String> deps = adminMapper.getLowerFinanceDep(TokenManager.getAdminId());