change пре 4 година
родитељ
комит
93878a67e6

+ 23 - 13
zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitCompanyServiceImpl.java

@@ -263,6 +263,9 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
             }
             RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
             recruitNeedsQueryBo.setCompanyId(companyVo.getCompanyId());
+            List<Integer> statusList = new ArrayList<>();
+            statusList.add(2);
+            recruitNeedsQueryBo.setStatus(statusList);
             List<String> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
             companyVo.setRecruitNeedsVoList(list);
         }
@@ -285,24 +288,31 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
             }
             RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
             recruitNeedsQueryBo.setCompanyId(companyId);
+            List<Integer> statusList = new ArrayList<>();
+            statusList.add(2);
+            recruitNeedsQueryBo.setStatus(statusList);
+            List<String> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
+            recruitCompanyNeedVo.setRecruitNeedsVoList(list);
+            return recruitCompanyNeedVo;
+        }else {
+            RecruitCompany db = this.baseMapper.selectById(companyId);
+            RecruitCompanyNeedVo recruitCompanyNeedVo = BeanUtil.toBean(db, RecruitCompanyNeedVo.class);
+            if (recruitCompanyNeedVo.getCompanyTypeId() != null && recruitCompanyNeedVo.getCompanySizeId() != null) {
+                SysDictData sysDictData = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanyTypeId());
+                SysDictData sysDictData1 = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanySizeId());
+                recruitCompanyNeedVo.setCompanyType(sysDictData.getDictLabel());
+                recruitCompanyNeedVo.setCompanySize(sysDictData1.getDictLabel());
+            }
+            RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
+            recruitNeedsQueryBo.setCompanyId(companyId);
+            List<Integer> statusList = new ArrayList<>();
+            statusList.add(2);
+            recruitNeedsQueryBo.setStatus(statusList);
             List<String> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
             recruitCompanyNeedVo.setRecruitNeedsVoList(list);
             return recruitCompanyNeedVo;
         }
-        RecruitCompany db = this.baseMapper.selectById(companyId);
-        RecruitCompanyNeedVo recruitCompanyNeedVo = BeanUtil.toBean(db, RecruitCompanyNeedVo.class);
-        if (recruitCompanyNeedVo.getCompanyTypeId() != null && recruitCompanyNeedVo.getCompanySizeId() != null) {
-            SysDictData sysDictData = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanyTypeId());
-            SysDictData sysDictData1 = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanySizeId());
-            recruitCompanyNeedVo.setCompanyType(sysDictData.getDictLabel());
-            recruitCompanyNeedVo.setCompanySize(sysDictData1.getDictLabel());
-        }
-        RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
-        recruitNeedsQueryBo.setCompanyId(companyId);
-        List<String> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
-        recruitCompanyNeedVo.setRecruitNeedsVoList(list);
 
-        return recruitCompanyNeedVo;
     }
 
     /**

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitNeedsMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN v_tenant_company vtc ON rn.company_id = vtc.company_id
         WHERE
         1 = 1
-        <if test="companyId != null and companyId != ''" >
+        <if test="companyId != null" >
             AND rn.company_id = #{companyId}
         </if>
         <if test="city != null and city != ''">