Parcourir la source

部门红包扣减,admin用户不会回到部门余额里

zyy il y a 1 mois
Parent
commit
6f020f61e2

+ 2 - 2
fs-admin/src/main/java/com/fs/his/controller/FsCompanyDeductController.java

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