【市一】1、登录服务问题处理 2、电话挂断问题处理 3、查询报错问题处理

陈昶聿

12 小时以前 2d3b575ed96eee7ccd5b324baa3135d2236934ac

 ruoyi-common/src/main/java/com/ruoyi/common/aspectj/SetOrgIdAspect.java

@@ -42,12 +42,19 @@
            {
                String orgid = loginUser.getUser().getOrgid();
                String campusid = loginUser.getUser().getCampusid();
                boolean allCampusUser = false;
                //显示所有院区权限
                String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all");
                if(StringUtils.isNotEmpty(allCampus)){
                    allCampus = "," + allCampus + ",";
                    if (allCampus.contains("," + loginUser.getUser().getUserName() + ",")) {
                    String userName = loginUser.getUser().getUserName();
                    if (StringUtils.isNotEmpty(userName)) {
                        for (String item : allCampus.split("[,，;；\\s]+")) {
                            if (userName.equals(item.trim())) {
                        campusid = null;
                                allCampusUser = true;
                                break;
                            }
                        }
                    }
                }
                
@@ -76,10 +83,14 @@
                        }
                        
                        // 如果需要同时设置campusid
                        if (setOrgId.withCampusId() && campusid != null)
                        if (setOrgId.withCampusId())
                        {
                            String campusFieldName = setOrgId.campusField();
                            
                            if (allCampusUser) {
                                // 全院区权限必须覆盖请求里可能带进来的 campusid，
                                // 否则前端传 campusid=8 会重新把院区条件加回去。
                                setFieldValue(param, campusFieldName, null);
                            } else if (campusid != null) {
                            // 检查字段是否已经有值，如果有且skipIfPresent为true，则跳过设置
                            Object currentValueCampus = getFieldValue(param, campusFieldName);
                            if (setOrgId.skipIfPresent() && currentValueCampus != null && !currentValueCampus.toString().isEmpty()) {
@@ -94,6 +105,7 @@
            }
        }
    }
    }

    /**
     * 获取注解