diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index 68152bb5e..ea65f9d2a 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -130,7 +130,7 @@ public class SysWorkplaceController extends BaseController { BasicCollectUserRequest basicCollectUserRequest = new BasicCollectUserRequest(); basicCollectUserRequest.setWorkplaceCode(sysWorkplace.getOrderId()); List userWorkResponses = basicCollectUserService.filterList(basicCollectUserRequest); - if (userWorkResponses != null || userWorkResponses.size() >0){ + if (userWorkResponses.size() >0){ return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除"); } boolean save = sysWorkplaceService.removeById(sysWorkplace); diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java index 8b039f67d..8aa0e9fe2 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -75,23 +75,25 @@ public class SysWorkplace implements Serializable { /** - * 1.扫码生成业务单(必须插入); - * 2.按单校验三期(是否插入可选) - * 3.按单不校验三期(是否插入可选) + * 1.扫码生成业务单 + * 2.按单校验三期 + * 3.按单不校验三期( */ @TableField(value = "operationType") private Integer operationType; /** - * 1.不插入 - * 2. 要插入 + *1: '插入', + *2: '不插入', + *3: '提醒不插入' */ @TableField(value = "checkInsert") private Integer checkInsert; /** - * 1:信息提醒 - * 2。禁止录入 + *1: '信息提醒', + *2: '信息弹框提醒', + *3: '不提醒' */ @TableField(value = "warnType") private Integer warnType; @@ -114,6 +116,14 @@ public class SysWorkplace implements Serializable { private Integer corpType; + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + + @TableField(exist = false) private String invName; @@ -123,5 +133,9 @@ public class SysWorkplace implements Serializable { @TableField(exist = false) private String employeeName; + //单据来源系统 + @TableField(exist = false) + private String fromTypeName; + } diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java index 99e62f131..1e983bf1f 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -14,9 +14,6 @@ import lombok.Data; public class SysWorkplaceResponse extends SysWorkplace { - - - //组别名称 private String categoryName; //单据编号