diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 0ec4aca4..3cfaf9d5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -482,7 +482,7 @@ public class TmTaskController extends BaseController { return AjaxResult.error("参数错误"); } if (SecurityUtils.getLoginUser() != null) { - Long userid = SecurityUtils.getLoginUser().getUserid(); + Long userid = SecurityUtils.getLoginUser().getSysUser().getUserId(); task.setUserId(String.valueOf(userid)); } // app端传1 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java index c8eafccd..4a93f770 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java @@ -87,6 +87,9 @@ public class PurchaseCheckInfo extends BaseEntity @ApiModelProperty(value = "采购状态") @Excel(name = "状态") private String purchasingStatus; + /** 采购状态 */ + @ApiModelProperty(value = "采购状态ID") + private Integer purchasingId; /** 入库人员 */ @ApiModelProperty(value = "入库人员") @@ -210,6 +213,13 @@ public class PurchaseCheckInfo extends BaseEntity public void setPurchasingStatus(String purchasingStatus) { this.purchasingStatus = purchasingStatus; } + public Integer getPurchasingId() { + return purchasingId; + } + + public void setPurchasingId(Integer purchasingId) { + this.purchasingId = purchasingId; + } public String getPurchasingTypeName() { return purchasingTypeName; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index ac6cffa5..9255e219 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"