修改车辆管理

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

@@ -103,6 +103,7 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
                 criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
             }
         }
+        example.createCriteria().andGreaterThan("id",1);
         Page<Object> result = PageHelper.startPage(query.getPage(), query.getLimit());
         List<T> list = mapper.selectByExample(example);
         return new TableResultResponse<T>(result.getTotal(), list);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -88,6 +88,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(StringUtils.isNotBlank(currentUser.getDataZone())){
                 example.createCriteria().andIn("zoneId", Arrays.asList(currentUser.getDataZone().split(",")));
             }
+            example.createCriteria().andGreaterThan("id",1);
             Page<Object> result = PageHelper.startPage(query.getPage(), query.getLimit());
             List<User> list = mapper.selectByExample(example);
             return new TableResultResponse<User>(result.getTotal(), list);

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleBiz.java

@@ -228,6 +228,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList){
             Vehicle vehicle = new Vehicle();
             BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
+            vehicle.setParkBranchCompanyId(vehicle.getSubordinateBranch());
             //悲观锁，检查是否已存在车牌或编码
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){