diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java index 344d06614..f1b53fad5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java @@ -98,8 +98,11 @@ public class SysDeptController extends BaseController userGrade.setGrowthValue(1); userGrade.setPreferential("自定义优惠"); userGrade.setGasolineDiscount("无优惠"); + userGrade.setGasolineRule("[{\"gasolineRule1\":1,\"gasolineRule2\":1,\"gasolineRule3\":1}]"); userGrade.setDieselDiscount("无优惠"); + userGrade.setDieselRule("[{\"dieselRule1\":1,\"dieselRule2\":1,\"dieselRule3\":1}]"); userGrade.setNaturalGasDiscount("无优惠"); + userGrade.setNaturalGasRule("[{\"naturalGas1\":1,\"naturalGas2\":1,\"naturalGas3\":1}]"); userGradeService.insertUserGrade(userGrade,store.getId()); } return getSuccessResult(row); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java index d681e8615..66f430b56 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java @@ -188,6 +188,7 @@ public class SysDeptServiceImpl extends ServiceImpl imple public SysDept selectSysDeptByName(String deptName) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("dept_name",deptName); + queryWrapper.eq("if_delete","0"); return baseMapper.selectOne(queryWrapper); }