审批总经理角色判断

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -1444,6 +1444,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
         Set<String> spPostIds = new LinkedHashSet<>();
         Set<String> zcPostIds = new LinkedHashSet<>();
         List<DictInfo> query = new ArrayList<>();
+        boolean var = true; //发票、出差、用车不剔除总经理
         switch (type) {
             case 2://财务报销
                 query = jdbcTemplate.query("select id from c_dict_info where dict_name like '%财务报销%' and type = 6", new BeanPropertyRowMapper<>(DictInfo.class));
@@ -1459,15 +1460,18 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 break;
             case 6://用车审批
                 query = jdbcTemplate.query("select id from c_dict_info where dict_name like '%用车申请%' and type = 6", new BeanPropertyRowMapper<>(DictInfo.class));
+                var = false;
                 break;
             case 7://发票审批
                 query = jdbcTemplate.query("select id from c_dict_info where dict_name like '%发票管理%' and type = 6", new BeanPropertyRowMapper<>(DictInfo.class));
+                var = false;
                 break;
             case 8://外包支付
                 query = jdbcTemplate.query("select id from c_dict_info where dict_name like '%外包支付%' and type = 6", new BeanPropertyRowMapper<>(DictInfo.class));
                 break;
             case 9://出差审批
                 query = jdbcTemplate.query("select id from c_dict_info where dict_name like '%出差管理%' and type = 6", new BeanPropertyRowMapper<>(DictInfo.class));
+                var = false;
                 break;
         }
 
@@ -1489,7 +1493,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                         if (spRoleInfo.getRoleName().equals(dept.getDeptName())) {
                             spPostIds.add(dept.getId() + "");
 
-                            if (dept.getDeptName().equals("总经理")) {
+                            if (var && dept.getDeptName().equals("总经理")) {
                                 if (ObjectUtil.isEmpty(money)) {
                                     money = new BigDecimal("0");
                                 }