内控bug

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

@@ -219,7 +219,20 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                                 data = jdbcTemplate.query("select * from c_expense_financial_reimbursement_info where id = " + record.getExpenseInfoId(), new BeanPropertyRowMapper<>(EMFinancialReimbursementInfo.class)).stream().findAny().orElse(null);
                                 EMFinancialReimbursementInfoVO voCW = BeanUtil.copyProperties(data, EMFinancialReimbursementInfoVO.class);
                                 if (voCW != null) {
-                                    //pdf转jpg
+                                    //获取当前用户是否为财务人员，财务人员修改是否支付状态
+                                    if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
+                                        throw new ServiceException("获取当前用户信息失败，请联系管理员");
+                                    }
+                                    voCW.setUserNameVesting(userMap.get(voCW.getCreateUser()));
+                                    R<Dept> dept = iSysClient.getDept(Long.parseLong(SecureUtil.getDeptId()));
+                                    if (dept != null && dept.getData() != null) {
+                                        Dept deptObj = dept.getData();
+                                        if (deptObj != null && (deptObj.getDeptName().contains("财务") || deptObj.getDeptName().contains("人事"))) {
+                                            voCW.setIsFinancialPersonnel(1); //财务人员
+                                        }
+                                    }
+
+                                    //预览发票、附件，把PDF转为JPG格式
                                     if (ObjectUtil.isNotEmpty(voCW.getFrAttachmentUrl()) && ObjectUtil.isEmpty(voCW.getFrAttachmentUrlJpg())) {
                                         InputStream ossInputStream = CommonUtil.getOSSInputStream(voCW.getFrAttachmentUrl());
                                         byte[] bytes = PDFConverter.convertToJPG(ossInputStream);
@@ -264,18 +277,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                                             break;
                                         }
                                     }
-                                    voCW.setUserNameVesting(userMap.get(voCW.getCreateUser()));
-                                    //获取当前用户是否为财务人员，财务人员修改是否支付状态
-                                    if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
-                                        throw new ServiceException("获取当前用户信息失败，请联系管理员");
-                                    }
-                                    R<Dept> dept = iSysClient.getDept(Long.parseLong(SecureUtil.getDeptId()));
-                                    if (dept != null && dept.getData() != null) {
-                                        Dept deptObj = dept.getData();
-                                        if (deptObj != null && (deptObj.getDeptName().contains("财务") || deptObj.getDeptName().contains("人事"))) {
-                                            voCW.setIsFinancialPersonnel(1); //财务人员
-                                        }
-                                    }
+
                                     data = voCW;
                                 }
                                 break;