LY bug fix

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -412,7 +412,7 @@ public class TStaffmgrController extends BaseController
     {
         int insertResult = tStaffmgrService.insertTStaffmgr(tStaffmgr);
         tStaffmgr.setCreaterCode(getUserId().toString());
-        if (tStaffmgr.getUnit().equals("10") || tStaffmgr.getUnit().equals("18")) {
+        if (tStaffmgr.getUnit().equals("10") || tStaffmgr.getUnit().equals("18")|| tStaffmgr.getUnit().equals("20")) {
             TTrainingrecords tTrainingrecords = new TTrainingrecords();
             tTrainingrecords.setStaffId(tStaffmgr.getId());
             tTrainingrecords.setPlantCode(tStaffmgr.getPlantCode());
@@ -513,7 +513,6 @@ public class TStaffmgrController extends BaseController
                 tWorklicense.setDeptId(tStaffmgr.getDeptId());
                 tWorklicenseService.updateTWorklicense(tWorklicense);
             }
-
         }
         return toAjax(tStaffmgrService.updateTStaffmgr(tStaffmgr));
     }
@@ -716,7 +715,7 @@ public class TStaffmgrController extends BaseController
             failNum++;
             try {
                 tStaffmgrService.insertTStaffmgr(t);
-                if (t.getUnit().equals("10") || t.getUnit().equals("18")) {
+                if (t.getUnit().equals("10") || t.getUnit().equals("18")|| t.getUnit().equals("20")) {
                     TTrainingrecords tTrainingrecords = new TTrainingrecords();
                     tTrainingrecords.setStaffId(t.getId());
                     tTrainingrecords.setPlantCode(t.getPlantCode());

master/src/main/resources/mybatis/training/TTrainingRegularMapper.xml

@@ -46,6 +46,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by d.year, d.course_code
     </select>
 
     <select id="selectTTrainingRegularById" parameterType="Long" resultMap="TTrainingRegularResult">
@@ -150,4 +151,4 @@
         </foreach>
     </update>
 
-</mapper>
+</mapper>

ui/src/views/components/PlantProgList/index.vue

@@ -650,9 +650,6 @@ export default {
         nextreviewdate: [
           { required: true, message: this.$t('下次回顾日期') + this.$t('不能为空'), trigger: "blur" }
         ],
-        nexteditdate: [
-          { required: true, message: this.$t('下次修订日期') + this.$t('不能为空'), trigger: "blur" }
-        ],
         classify: [
           { required: true, message: this.$t('密级分类') + this.$t('不能为空'), trigger: "change" }
         ],