yzc 10 місяців тому
батько
коміт
4aeb53a5f0

+ 1 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/promotion/po/PromotionApply.java

@@ -20,6 +20,7 @@ import java.util.Date;
 @Setter
 @TableName("promotion_apply")
 public class PromotionApply extends BasePo {
+    private Long userId;
 
     /**
      * 10实习员工、20试用员工、30正式员工

+ 1 - 0
hx-oa/src/main/java/com/fjhx/oa/flow/PromotionApplyFlow.java

@@ -34,6 +34,7 @@ public class PromotionApplyFlow extends FlowDelegate {
         PromotionApplyDto dto = submitData.toJavaObject(PromotionApplyDto.class);
         dto.setFlowId(flowId);
         dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
+        dto.setUserId(SecurityUtils.getUserId());
 
         //回填用户名
         String nickName = SecurityUtils.getLoginUser().getUser().getNickName();

+ 1 - 0
hx-oa/src/main/resources/mapper/promotion/PromotionApplyMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.fjhx.oa.mapper.promotion.PromotionApplyMapper">
     <select id="getPage" resultType="com.fjhx.oa.entity.promotion.vo.PromotionApplyVo">
         select pa.id,
+               pa.user_id,
                pa.employee_type,
                pa.promotion_date,
                pa.remark,