LY bug fix

master/src/main/java/com/ruoyi/project/sems/his/controller/TApproveSpecModifyController.java

@@ -492,7 +492,6 @@ public class TApproveSpecModifyController extends BaseController
                         TSpecdevDt dtEntity = tSpecdevDtService.getById(i);
                         dtEntity.setApproveStatus(0l);
                         tSpecdevDtService.updateById(dtEntity);
-
                         if (tApproveSpecModify.getApproveType() == 1){
                             TSpechiDt hientity = tSpechiDtService.selectTSpechiDtById(Long.parseLong(tApproveSpecModify.getDevId()));
                             tSpecdevDtService.updateTSpecdevDtByHi(hientity);

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /u03/cpmsfile/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /u03/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -162,7 +162,6 @@
                          open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-
             </if>
             <if test="education != null  and education != ''"> and education = #{education}</if>
             <if test="educations != null  and educations != ''">
@@ -196,7 +195,6 @@
         ORDER BY s0.DICT_SORT, s1.DICT_SORT ,s.DICT_SORT
     </select>
 
-
     <select id="selectTStaffmgrListAll" parameterType="TStaffmgr" resultMap="TStaffmgrResult">
         <include refid="selectTStaffmgrVo"/>
         Left join SYS_DICT_DATA s0 on d.UNIT = s0.DICT_VALUE and s0.DICT_TYPE ='STAFF_UNIT'

ui/src/views/plant/targetlist/index.vue

@@ -104,7 +104,10 @@
 
     <!-- 添加或修改目标录入对话框 -->
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="form.parentId !== 0?rulesTwo:rulesTwo" label-width="80px">
+        <el-form-item :label="$t('父级目录')" prop="parentId">
+          <treeselect v-model="form.parentId" :options="targetlistOptions" :normalizer="normalizer" :placeholder="$t('请选择') + $t('父级目录')" />
+        </el-form-item>
         <el-form-item label="ITEM" prop="item">
           <el-input v-model="form.item" :placeholder="$t('请输入') + 'ITEM'" />
         </el-form-item>
@@ -141,9 +144,6 @@
         <el-form-item :label="$t('归属部门')" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
         </el-form-item>
-        <el-form-item :label="$t('父级目录')" prop="parentId">
-          <treeselect v-model="form.parentId" :options="targetlistOptions" :normalizer="normalizer" :placeholder="$t('请选择') + $t('父级目录')" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>