Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPersonnelServiceImpl.java

@@ -79,7 +79,8 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
         LambdaQueryWrapper<PatrolInspectionPersonnel> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionPersonnel::getEnable, 1)
                 .eq(PatrolInspectionPersonnel::getUserId, patrolInspectionPersonnel.getUserId())
-                .eq(PatrolInspectionPersonnel::getAreaId, patrolInspectionPersonnel.getAreaId())
+//                .eq(PatrolInspectionPersonnel::getAreaId, patrolInspectionPersonnel.getAreaId())
+                .ne(PatrolInspectionPersonnel::getId,patrolInspectionPersonnel.getId())
                 .eq(PatrolInspectionPersonnel::getTenantId, SecurityUtils.getTenantId());
         if ("00".equals(userType)) {
             queryWrapper.eq(PatrolInspectionPersonnel::getCreator, SecurityUtils.getUsername());