Browse Source

LY 预约票 bugfix

ly 2 years ago
parent
commit
9249347571

+ 6 - 5
master/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.system.controller;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,13 +134,13 @@ public class SysDeptController extends BaseController
         }
         }
         dept.setCreateBy(SecurityUtils.getUsername());
         dept.setCreateBy(SecurityUtils.getUsername());
         deptService.insertDept(dept);
         deptService.insertDept(dept);
-//        try {
+        try {
             //承包商权限覆盖
             //承包商权限覆盖
             deptMapper.insertCbs(dept);
             deptMapper.insertCbs(dept);
-//        }
-//        catch (Exception e) {
-//
-//        }
+        }
+        catch (Exception e) {
+            logger.error(e.toString());
+        }
         return toAjax(1);
         return toAjax(1);
     }
     }
 
 

BIN
master/src/main/resources/static/word/invoice/book.docx


+ 6 - 0
ui/src/views/invoice/tag/index.vue

@@ -196,6 +196,12 @@ export default {
       form: {},
       form: {},
       // 表单校验
       // 表单校验
       rules: {
       rules: {
+        tag: [
+          {required: true, message: "索引不能为空", trigger: "blur"}
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
       }
       }
     };
     };
   },
   },

+ 1 - 1
ui/src/views/training/companylevel/index.vue

@@ -356,7 +356,7 @@ export default {
       },
       },
       //人员表查询参数
       //人员表查询参数
       staffmgrQueryParams: {
       staffmgrQueryParams: {
-        units: "10,18",
+        units: "10,18,20",
         actualpost: null
         actualpost: null
       },
       },
       //人员表联查
       //人员表联查