diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue index 1b2e358b..4c4f5bde 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue @@ -85,7 +85,7 @@ - + diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue index 0cd02a61..da43f6af 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue @@ -184,7 +184,7 @@ - + diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue index f281478e..c2921b66 100644 --- a/ruoyi-ui/src/views/work/workTrain/index.vue +++ b/ruoyi-ui/src/views/work/workTrain/index.vue @@ -184,7 +184,7 @@ - + diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue index 9ce63f32..5b3d2895 100644 --- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue +++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue @@ -85,7 +85,7 @@ - + diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html b/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html index 422c5b39..624396a0 100644 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html +++ b/ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html @@ -43,8 +43,8 @@ diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html b/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html index 23c6b5ce..1522606c 100644 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html +++ b/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html @@ -43,8 +43,8 @@ diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index ea0346a4..c9b225b1 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from work_train wt left join work_train_dept wtd on wtd.train_id = wt.id left join sys_dept sd on sd.dept_id = wtd.dept_id + left join sur_project sp on sp.id = wt.project_id left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value