Kaynağa Gözat

财务报销 功能优化

zhaoxian 2 yıl önce
ebeveyn
işleme
b5ffa45a23

+ 12 - 10
jeecg-boot-module-system/src/main/java/cn/com/ctop/reimburse/mondule/service/impl/ReimburseApplyServiceImpl.java

@@ -216,14 +216,16 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
             this.updateById(apply);
             if (!Check.isNull(sender)) {
                 baseMapper.insertRel(sender, apply.getId());
-                //流程到财务审核
-                if (isFinancialReview) {
-                    //财务审核roleId : 32825ea6b43cb61bffa09bf05ad69cf2
-                    List<SysUser> users = sysUserService.getUserListByRoleId("32825ea6b43cb61bffa09bf05ad69cf2");
-                    for (SysUser user : users) {
-                        sendMsg(user.getId(), type, id, msg);
-                    }
-                } else {
+            }
+            //流程到财务审核
+            if (isFinancialReview) {
+                //财务审核roleId : 32825ea6b43cb61bffa09bf05ad69cf2
+                List<SysUser> users = sysUserService.getUserListByRoleId("32825ea6b43cb61bffa09bf05ad69cf2");
+                for (SysUser user : users) {
+                    sendMsg(user.getId(), type, id, msg);
+                }
+            } else {
+                if (!Check.isNull(sender)) {
                     sendMsg(sender, type, id, msg);
                 }
             }
@@ -379,9 +381,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
         String type = "KS";
         String typ = "BL,TJ,JH,SY";
         for (ReimburseProject project : projects) {
-            if (type.equals(project.getType())) {
+            if (type.equals(project.getProject())) {
                 return baseMapper.selectWelfareLeader("考试福利");
-            } else if (typ.contains(project.getType())) {
+            } else if (typ.contains(project.getProject())) {
                 return baseMapper.selectWelfareLeader("其他福利");
             }
         }