危害、动火开票

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -120,23 +120,23 @@ public class TApproveReserveInvoiceController extends BaseController {
             tApprove.setUser(sqr);
         }
         // 用户主管
-        SysUser yhzg = iSysUserService.selectUserById(tApprove.getUserSupId());
-        if (yhzg != null) {
+        if (tApprove.getUserSupId() != null) {
+            SysUser yhzg = iSysUserService.selectUserById(tApprove.getUserSupId());
             tApprove.setUserSup(yhzg);
         }
         // 装置主管
-        SysUser zzzg = iSysUserService.selectUserById(tApprove.getDevSupId());
-        if (zzzg != null) {
+        if (tApprove.getDevSupId() != null) {
+            SysUser zzzg = iSysUserService.selectUserById(tApprove.getDevSupId());
             tApprove.setDevSup(zzzg);
         }
         // 装置工程师
-        SysUser zzgcs = iSysUserService.selectUserById(tApprove.getDevEngineerId());
-        if (zzgcs != null) {
+        if (tApprove.getDevEngineerId() != null) {
+            SysUser zzgcs = iSysUserService.selectUserById(tApprove.getDevEngineerId());
             tApprove.setDevEngineer(zzgcs);
         }
         // 装置经理
-        SysUser zzjl = iSysUserService.selectUserById(tApprove.getManagerconId());
-        if (zzjl != null) {
+        if (tApprove.getManagerconId() != null) {
+            SysUser zzjl = iSysUserService.selectUserById(tApprove.getManagerconId());
             tApprove.setManagercon(zzjl);
         }
         return AjaxResult.success(tApprove);

ui/src/views/invoice/bookingworkticket/index.vue

@@ -320,11 +320,8 @@
       <u-table-column label="开票" align="center" fixed="right" width="90">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.addStatus == 1" size="small" type="success">已开票</el-tag>
-
           <el-tag v-else-if="scope.row.bookingworkticket.status== 3" size="small" type="info">未开票</el-tag>
-
         </template>
-
       </u-table-column>
       <u-table-column label="续票预约" fixed="right" align="center" width="90">
         <template slot-scope="scope">