fix 需求发布

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsAddBo.java

@@ -67,9 +67,6 @@ public class RecruitNeedsAddBo {
     /** 0 失效 1启用 */
     @ApiModelProperty("0 停止 1未发布 2已发布")
     private Integer status;
-    /** 商户ID */
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
     /** 1月薪 2年薪 */
     @ApiModelProperty("1月薪 2年薪")
     private Integer incomeType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsEditBo.java

@@ -83,10 +83,6 @@ public class RecruitNeedsEditBo {
     @ApiModelProperty("0 停止 1未发布 2已发布")
     private Integer status;
 
-    /** 商户ID */
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
-
     /** 1月薪 2年薪 */
     @ApiModelProperty("1月薪 2年薪")
     private Integer incomeType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsQueryBo.java

@@ -80,9 +80,6 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 停止 1未发布 2已发布")
 	private List<Integer> status;
-	/** 商户ID */
-	@ApiModelProperty("商户ID")
-	private Long tenantId;
 	/** 1月薪 2年薪 */
 	@ApiModelProperty("1月薪 2年薪")
 	private Integer incomeType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitNeeds.java

@@ -78,9 +78,6 @@ private static final long serialVersionUID=1L;
     /** 0 失效 1启用 */
     private Integer status;
 
-    /** 商户ID */
-    private Long tenantId;
-
     /** 1月薪 2年薪 */
     private Integer incomeType;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitTemplate.java

@@ -78,8 +78,6 @@ private static final long serialVersionUID=1L;
     /** 0 失效 1启用 */
     private Integer status;
 
-    /** 商户ID */
-    private Long tenantId;
 
     /** 1月薪 2年薪 */
     private Integer incomeType;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitNeedsServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.recruit.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsAddBo;
@@ -64,7 +65,6 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
         lqw.eq(StrUtil.isNotBlank(bo.getMinimumEduDict()), RecruitNeeds::getMinimumEduDict, bo.getMinimumEduDict());
         lqw.eq(StrUtil.isNotBlank(bo.getMajor()), RecruitNeeds::getMajor, bo.getMajor());
         lqw.eq(bo.getStatus() != null, RecruitNeeds::getStatus, bo.getStatus());
-        lqw.eq(bo.getTenantId() != null, RecruitNeeds::getTenantId, bo.getTenantId());
         lqw.eq(bo.getIncomeType() != null, RecruitNeeds::getIncomeType, bo.getIncomeType());
         lqw.eq(StrUtil.isNotBlank(bo.getProvince()), RecruitNeeds::getProvince, bo.getProvince());
         lqw.eq(StrUtil.isNotBlank(bo.getCity()), RecruitNeeds::getCity, bo.getCity());
@@ -116,15 +116,19 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
         RecruitNeeds update = BeanUtil.toBean(bo, RecruitNeeds.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        if(bo.getStatus()==2){
+        if(bo.getStatus()!=null&&bo.getStatus()==2){
             RecruitNeedsVo vo = queryById(bo.getId());
             if(vo.getStatus()==1){
+                if(update.getPushTime()!=null){
+                    throw new CustomException("不允许二次发布");
+                }
                 //发布操作
-                bo.setPushTime(DateUtils.getNowTime());
-                bo.setPushMan(operator_nickName);
+                update.setPushTime(DateUtils.getNowTime());
+                update.setPushMan(operator_nickName);
             }
 
         }
+        System.out.println(update);
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitNeedsVo.java

@@ -81,10 +81,6 @@ public class RecruitNeedsVo {
 	@Excel(name = "0 失效 1启用")
 	@ApiModelProperty("0 失效 1启用")
 	private Integer status;
-	/** 商户ID */
-	@Excel(name = "商户ID")
-	@ApiModelProperty("商户ID")
-	private Long tenantId;
 	/** 1月薪 2年薪 */
 	@Excel(name = "1月薪 2年薪")
 	@ApiModelProperty("1月薪 2年薪")

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

@@ -22,7 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
-        <result property="tenantId" column="tenant_id"/>
         <result property="incomeType" column="income_type"/>
         <result property="province" column="province"/>
         <result property="city" column="city"/>