LY 培训

master/src/main/java/com/ruoyi/project/training/controller/TTrainingController.java

@@ -475,7 +475,7 @@ public class TTrainingController extends BaseController {
     public void AutoReport(HttpServletRequest request, HttpServletResponse response, Long year, Long trainingId) {
         TTraining tTraining = tTrainingMapper.selectTTrainingById(trainingId);
         String tempUrl = "";
-        if (tTraining.getDeptId() == 103) {
+        if (tTraining.getDeptId() == 103 || tTraining.getDeptId() == 10012) {
             if (tTraining.getTrainingType().equals("12")) {
                 tempUrl = "static/word/training/signMOC.docx"; // 模板文件
             } else {

ui/src/views/training/companylevel/index.vue

@@ -357,7 +357,7 @@ export default {
       },
       //人员表查询参数
       staffmgrQueryParams: {
-        units: "10,18,20",
+        units: "10,18,20,30",
         leftYear: this.getNowTime(),
         actualpost: null
       },

ui/src/views/training/trainingrecords/index.vue

@@ -856,7 +856,7 @@ export default {
       },
       //人员表查询参数
       staffmgrQueryParams: {
-        units: "10,18,20",
+        units: "10,18,20,30",
         leftYear: this.getNowTime(),
       },
       queryCompanyParams: {
@@ -870,7 +870,7 @@ export default {
         trainingType: null
       },
       deviceParams: {
-        units: "10,18,20",
+        units: "10,18,20,30",
         staffId: null,
         regularId: null,
         year: null,