Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -706,4 +706,34 @@
      // 返回
      return null;
   }

   /**
    * 门牌地址表（总台账数据） 自定义详情
    */
   @Override
   public Object getDetail(DoorplateAddressVO doorplateAddress) {
      List<String> list = new ArrayList<>();
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      if (null!=one){
         if (!Strings.isBlank(doorplateAddress.getRoleName())) {
            // 判断是否有权限
            if (doorplateAddress.getRoleName().equals("网格员")) {
               list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
               boolean contains = list.contains(doorplateAddress.getAddressCode());
               if (list.size()==0 || !contains){
                  // 无权限
                  one.setIsJur(2);
               }else {
                  one.setIsJur(1);
               }
            }else {
               // 不限制
               one.setIsJur(1);
            }
         }
         return one;
      }
      return null;
   }
}