提交代码

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml

@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectPersonPhone != null and projectPersonPhone != ''"> and pi.project_person_phone = #{projectPersonPhone}</if>
             <if test="projectStatus != null and projectStatus != ''"> and pi.project_status = #{projectStatus}</if>
             <if test="isDel != null "> and pi.is_del = #{isDel}</if>
+            and pi.is_del !=2 
         </where>
         <if test="currentUserId == null "> order by pi.project_sort, pi.id desc</if>
         <if test="currentUserId != null "> order by pu.sort_by, pi.id desc</if>
@@ -344,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where dept_id = #{deptId}
     </update>
+
     <select id="selectMyProjectList" parameterType="ProProjectInfo" resultMap="ProProjectInfoResult">
         select pi.id, pi.com_id,  pi.dis_dept_id, pi.project_name,
         pi.project_code, pi.simple_name, pi.project_type, sdd1.dict_label as project_type_name, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature,
@@ -376,8 +378,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectPersonPhone != null and projectPersonPhone != ''"> and pi.project_person_phone = #{projectPersonPhone}</if>
             <if test="projectStatus != null and projectStatus != ''"> and pi.project_status = #{projectStatus}</if>
             <if test="isDel != null "> and pi.is_del = #{isDel}</if>
+            and pi.is_del!= 2
         </where>
         <if test="currentUserId == null "> order by pi.project_sort, pi.id desc</if>
         <if test="currentUserId != null "> order by pu.sort_by, pi.id desc</if>
     </select>
+
 </mapper>

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java

@@ -149,6 +149,13 @@ public class ProProjectInfoController extends BaseController
         if(StringUtils.isNotEmpty(list)){
             return getDataTable(list);
         }
+        if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+            if(SecurityUtils.isGSAdmin()){
+                proProjectInfo.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
+            }else{
+                proProjectInfo.setCurrentUserId(SecurityUtils.getUserId());
+            }
+        }
         list = proProjectInfoService.selectMyProjectList(proProjectInfo);
         redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         return getDataTable(list);

yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue

@@ -162,7 +162,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工种岗位" prop="craftPost">
-          <el-select v-model="form.craftPost" placeholder="请选择工种岗位" style="width:100%">
+          <el-select v-model="form.craftPost" multiple placeholder="请选择工种岗位" style="width:100%">
             <el-option
               v-for="dict in pro_craft_post"
               v-show="dict.elTagClass == form.craftType"
@@ -375,6 +375,9 @@ function handleUpdate(row) {
   reset();
   const _id = row.id || ids.value
   getBusExamInfo(_id).then(response => {
+    if(response.data.craftPost){
+      response.data.craftPost = response.data.craftPost.split(',');
+    }
     form.value = response.data;
     busExamInfoQuesList.value = response.data.busExamInfoQuesList;
     open.value = true;
@@ -386,6 +389,7 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["busExamInfoRef"].validate(valid => {
     if (valid) {
+      form.value.craftPost = form.value.craftPost.toString()
       form.value.busExamInfoQuesList = busExamInfoQuesList.value;
       if (form.value.id != null) {
         updateBusExamInfo(form.value).then(response => {

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue

@@ -129,13 +129,13 @@
         </el-form-item>
         <el-form-item label="工种类型" prop="craftType">
           <el-select v-model="form.craftType" placeholder="请选择工种类型" style="width:100%">
-            <el-option v-for="dict in pro_craft_type" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in pro_craft_type" v-show="dict.value != '3'" :key="dict.value" :label="dict.label"
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工种岗位" prop="craftPost">
+        <el-form-item label="工种岗位" prop="craftPost" v-if="form.craftType">
           <el-select v-model="form.craftPost" placeholder="请选择工种岗位" style="width:100%">
-            <el-option v-for="dict in pro_craft_post" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in pro_craft_post" v-show="dict.elTagClass == form.craftType" :key="dict.value" :label="dict.label"
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>