车车 10 месяцев назад
Родитель
Сommit
bc1fffbc3b

+ 3 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workflow/vo/WorkflowModePageReqVO.java

@@ -13,6 +13,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class WorkflowModePageReqVO extends PageParam {
 
+    @Schema(description = "id")
+    private Long id;
+
     @Schema(description = "编码")
     private String modeCode;
 

+ 3 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workstation/vo/WorkstationPageReqVO.java

@@ -14,6 +14,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class WorkstationPageReqVO extends PageParam {
 
+    @Schema(description = "id")
+    private Long id;
+
     @Schema(description = "岗位编号")
     private String workstationCode;
 

+ 1 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workflow/WorkflowModeMapper.java

@@ -21,6 +21,7 @@ public interface WorkflowModeMapper extends BaseMapperX<WorkflowModeDO> {
 
     default PageResult<WorkflowModeDO> selectPage(WorkflowModePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WorkflowModeDO>()
+                .eqIfPresent(WorkflowModeDO::getId, reqVO.getId())
                 .eqIfPresent(WorkflowModeDO::getModeCode, reqVO.getModeCode())
                 .eqIfPresent(WorkflowModeDO::getIsPreset, reqVO.getIsPreset())
                 .likeIfPresent(WorkflowModeDO::getModeName, reqVO.getModeName())

+ 3 - 0
yudao-module-iscs/src/main/resources/mapper/WorkstationMapper.xml

@@ -18,6 +18,9 @@
         LEFT JOIN system_users u ON u.id = w.creator
         <where>
             w.deleted = 0
+            <if test="vo.id != null">
+                and w.id = #{vo.id}
+            </if>
             <if test="vo.workstationName != null and vo.workstationName.trim != ''">
                 and w.workstation_name like concat('%',#{vo.workstationName},'%')
             </if>