|
@@ -179,7 +179,7 @@ public class FsCompanyDeductController extends BaseController
|
|
|
|
|
|
|
|
SysConfig courseConfig = sysConfigMapper.selectConfigByConfigKey("course.config");
|
|
SysConfig courseConfig = sysConfigMapper.selectConfigByConfigKey("course.config");
|
|
|
CourseConfig config = JSON.parseObject(courseConfig.getConfigValue(), CourseConfig.class);
|
|
CourseConfig config = JSON.parseObject(courseConfig.getConfigValue(), CourseConfig.class);
|
|
|
- if(config.getDeptLimit() != null && config.getDeptLimit()& !loginUser.isAdmin()){
|
|
|
|
|
|
|
+ if(config.getDeptLimit() != null && config.getDeptLimit() && !loginUser.isAdmin()){
|
|
|
SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(loginUser.getDeptId());
|
|
SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(loginUser.getDeptId());
|
|
|
BigDecimal redPackage = deptConfig.getRedPackage();
|
|
BigDecimal redPackage = deptConfig.getRedPackage();
|
|
|
BigDecimal nowMoney = redPackage.add(deduct.getMoney());
|
|
BigDecimal nowMoney = redPackage.add(deduct.getMoney());
|