Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/common/cache/SysCache.java

@@ -401,12 +401,8 @@
            // 查询对应的区域编号code
            Dept dept = deptService.getById(id);
            if (null != dept) {
               if (
                  (roleName.equals("mj") && dept.getDeptNature()==1) ||
                  (
                     (roleName.equals("wgy") || roleName.equals("wzcj")) && dept.getDeptNature()==2
                  )
               ){
               if ((roleName.equals("mj") && dept.getDeptNature() == 1) ||
                  ((roleName.equals("wgy") || roleName.equals("wzcj")) && dept.getDeptNature() == 2)) {
                  if (!AuthUtil.isAdministrator()) {
                     if (dept.getRegionCode() == null) {
                        return;