Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

添加了资产申领的后台管理功能，包括创建、查询和更新资产申领状态的功能。实现了与流程实例的绑定及监听器处理。优化了文件上传与流程实例的关联逻辑，确保附件能正确绑定流程实例。

此次更新包括：
1. 新增资产申领的错误代码常量。
2. 创建了资产申领的Controller，提供创建和查询资产申领的API。
3. 设计了资产申领的请求和响应VO类。
4. 实现了资产申领的Mapper接口及Service接口和实现类。
5. 添加了资产申领的结果监听器，处理流程实例结果事件。
6. 优化了资产申领的流程实例绑定逻辑和文件上传处理。

此次功能的添加，将有效支持资产申领的业务流程管理，提升资产申领处理的效率。

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -37,6 +37,7 @@ public interface ErrorCodeConstants {
     ErrorCode OA_ENTRY_NOT_EXISTS = new ErrorCode(1_009_001_111, "入职申请不存在");
     ErrorCode OA_GOOut_NOT_EXISTS = new ErrorCode(1_009_001_112, "外出申请不存在");
     ErrorCode OA_SALARY_NOT_EXISTS = new ErrorCode(1_009_001_113, "薪资付款申请不存在");
+    ErrorCode OA_ASSET_NOT_EXISTS = new ErrorCode(1_009_001_114, "资产申领不存在");
 
     // ========== 流程模型 1-009-002-000 ==========
     ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimRespVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "管理后台 - OA 资金申领")
+@RestController
+@RequestMapping("/bpm/oa/assetClaim")
+@Validated
+public class BpmOAAssetClaimController {
+
+    @Resource
+    private BpmOAAssetClaimService assetClaimService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建请求申请")
+    public CommonResult<Long> createAssetClaim(@Valid @RequestBody BpmOAAssetClaimCreateReqVO createReqVO) {
+
+        return success(assetClaimService.createAssetClaim(getLoginUserId(), createReqVO));
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得资金申领申请")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<BpmOAAssetClaimRespVO> getAssetClaim(@RequestParam("id") Long id) {
+
+        BpmOAAssetClaimDO assetClaimDO = assetClaimService.getAssetClaim(id);
+
+        return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class));
+    }
+
+    @GetMapping("/getByProcessInstanceId")
+    @Operation(summary = "获得资金申领申请")
+    @Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
+    public CommonResult<BpmOAAssetClaimRespVO> getAssetClaimByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
+
+        BpmOAAssetClaimDO assetClaimDO = assetClaimService.getByProcessInstanceId(processInstanceId);
+
+        return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class));
+    }
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimCreateReqVO.java

@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 资产申领 创建 Request VO
+ *
+ * @author 符溶馨
+ */
+@Schema(description = "管理后台 - 资产申领创建 Request VO")
+@Data
+@EqualsAndHashCode()
+@ToString(callSuper = true)
+public class BpmOAAssetClaimCreateReqVO {
+
+    @Schema(description = "收款人信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "报销总金额不能为空")
+    private Long assetsTypeId;
+
+    @Schema(description = "现金支出明细")
+    private Integer num;
+
+    @Schema(description = "单位")
+    private String util;
+
+    @Schema(description = "流程实例编号")
+    private String processInstanceId;
+
+    @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer result;
+
+    @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<UploadUserFile> fileItems;
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimRespVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.Cash;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author 符溶馨
+ */
+@Schema(description = "管理后台 - 现金支出 请求Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class BpmOAAssetClaimRespVO extends BpmOABaseRespVO {
+
+    @Schema(description = "收款人信息")
+    private Long assetsTypeId;
+
+    @Schema(description = "现金支出明细")
+    private List<Cash> num;
+
+    @Schema(description = "报销总金额", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "报销总金额不能为空")
+    private BigDecimal util;
+
+    @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<UploadUserFile> fileItems;
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAAssetClaimDO.java

@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * OA 资产申领 DO
+ *
+ * @author 符溶馨
+ */
+@TableName(value ="bpm_oa_asset_claim", autoResultMap = true)
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BpmOAAssetClaimDO extends BaseDO {
+
+    /**
+     * 出差表单主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 申请人的用户编号
+     * 关联 AdminUserDO 的 id 属性
+     */
+    private Long userId;
+
+    /**
+     * 资产类型编号
+     */
+    private Long assetsTypeId;
+
+    /**
+     * 数量
+     */
+    private Integer num;
+
+    /**
+     * 单位
+     */
+    private String util;
+
+    /**
+     * 申请事由
+     */
+    private String reason;
+
+    /**
+     * 用章的结果
+     * 枚举 {@link BpmProcessInstanceResultEnum}、
+     * 考虑到简单，所以直接复用了 BpmProcessInstanceResultEnum 枚举，也可以自己定义一个枚举哈
+     */
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
+
+    /**
+     * 附件基本信息
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<UploadUserFile> fileItems;
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAAssetClaimMapper.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 资产申领 Mapper
+ *
+ * @author 符溶馨
+
+ */
+@Mapper
+public interface BpmOAAssetClaimMapper extends BaseMapperX<BpmOAAssetClaimDO> {
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAssetClaimService.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.bpm.service.oa;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
+
+public interface BpmOAAssetClaimService {
+
+    /**
+     * 创建请求申请
+     * @param userId 用户id
+     * @param createReqVO 创建信息
+     * @return 创建的申请id
+     */
+    Long createAssetClaim(Long userId, BpmOAAssetClaimCreateReqVO createReqVO);
+
+    /**
+     * 获得资产申领申请
+     * @param id id
+     * @return 资产申领申请
+     */
+    BpmOAAssetClaimDO getAssetClaim(Long id);
+
+    /**
+     * 获得资产申领申请
+     * @param processInstanceId 流程实例编号
+     * @return 资产申领申请
+     */
+    BpmOAAssetClaimDO getByProcessInstanceId(String processInstanceId);
+
+    /**
+     * 更新资产申领的状态
+     *
+     * @param id     编号
+     * @param result 结果
+     */
+    void updateAssetClaimResult(String processInstanceId, Long id, Integer result);
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAssetClaimServiceImpl.java

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.bpm.service.oa;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAAssetClaimMapper;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
+import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
+import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_ASSET_NOT_EXISTS;
+
+/**
+ * OA 资产申领 Service 实现类
+ *
+ * @author 符溶馨
+ */
+@Service
+@Validated
+public class BpmOAAssetClaimServiceImpl extends BpmOABaseService implements BpmOAAssetClaimService{
+
+    /**
+     * OA 资产申领对应的流程定义 KEY
+     */
+    public static final String PROCESS_KEY = "oa_asset_claim_2";
+
+    @Resource
+    private BpmOAAssetClaimMapper assetClaimMapper;
+
+    @Resource
+    private BpmProcessInstanceService processInstanceService;
+
+    @Resource
+    private BpmHistoryProcessInstanceService historyProcessInstanceService;
+
+    @Override
+    public Long createAssetClaim(Long userId, BpmOAAssetClaimCreateReqVO createReqVO) {
+
+        //插入OA 现金支出申请
+        BpmOAAssetClaimDO assetClaim = BeanUtils.toBean(createReqVO, BpmOAAssetClaimDO.class).setUserId(userId)
+                .setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
+        assetClaimMapper.insert(assetClaim);
+
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        String processInstanceId = processInstanceService.createProcessInstance(userId,
+                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
+                        .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(assetClaim.getId())));
+
+        // 将工作流的编号，更新到 OA 现金支出单中
+        assetClaimMapper.updateById(new BpmOAAssetClaimDO().setId(assetClaim.getId()).setProcessInstanceId(processInstanceId));
+
+        // 判断是否为重新发起的流程
+        if (createReqVO.getProcessInstanceId() != null && createReqVO.getResult() == 3) {
+
+            historyProcessInstanceService.createHistoryProcessInstance(processInstanceId, createReqVO.getProcessInstanceId());
+        }
+
+        List<UploadUserFile> fileItems = createReqVO.getFileItems();
+        //这里的逻辑，如果fileItems不为空，且有数据，那么说明是上传了附件的，则需要更工作流文件表对应的实例Id
+        if (fileItems != null && !fileItems.isEmpty()) {
+            uploadBpmFileProcessInstanceId(processInstanceId, fileItems);
+        }
+        return assetClaim.getId();
+    }
+
+    @Override
+    public BpmOAAssetClaimDO getAssetClaim(Long id) {
+
+        return assetClaimMapper.selectById(id);
+    }
+
+    @Override
+    public BpmOAAssetClaimDO getByProcessInstanceId(String processInstanceId) {
+
+        return assetClaimMapper.selectOne(BpmOAAssetClaimDO::getProcessInstanceId, processInstanceId);
+    }
+
+    @Override
+    public void updateAssetClaimResult(String processInstanceId, Long id, Integer result) {
+
+        validateLeaveExists(id);
+        assetClaimMapper.updateById(new BpmOAAssetClaimDO().setId(id).setResult(result));
+    }
+
+    private void validateLeaveExists(Long id) {
+        if (assetClaimMapper.selectById(id) == null) {
+            throw exception(OA_ASSET_NOT_EXISTS);
+        }
+    }
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java

@@ -97,7 +97,6 @@ public class BpmOAGoOutServiceImpl extends BpmOABaseService implements BpmOAGoOu
 
         // -- 自己取消
         // -- 审核拒绝
-        //所有关联的采购申请改为 未支付状态
         if (BpmProcessInstanceResultEnum.REJECT.getResult().equals(result)
                 || BpmProcessInstanceResultEnum.CANCEL.getResult().equals(result)
                 || BpmProcessInstanceResultEnum.BACK.getResult().equals(result)) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularService.java

@@ -28,7 +28,7 @@ public interface BpmOARegularService {
      * @param id 编号
      * @param result 结果
      */
-    void updateRegularResult(Long id, Integer result);
+    void updateRegularResult(String processInstanceId, Long id, Integer result);
 
     /**
      * 获得转正申请

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java

@@ -1,21 +1,37 @@
 package cn.iocoder.yudao.module.bpm.service.oa;
 
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureListEditReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.regular.BpmOARegularCreateReqVO;
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.Reimbursement;
 import cn.iocoder.yudao.module.bpm.convert.oa.BpmOARegularConvert;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAImprestDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcureDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAReimbursementDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOARegularMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
+import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_REGULAR_NOT_EXISTS;
@@ -44,6 +60,12 @@ public class BpmOARegularServiceImpl extends BpmOABaseService implements BpmOARe
     @Resource
     private BpmHistoryProcessInstanceService historyProcessInstanceService;
 
+    @Resource
+    private BpmProcessInstanceService bpmProcessInstanceService;
+
+    @Resource
+    private AdminUserApi userApi;
+
     @Override
     public Long createRegular(Long userId, BpmOARegularCreateReqVO createReqVO) {
 
@@ -76,9 +98,21 @@ public class BpmOARegularServiceImpl extends BpmOABaseService implements BpmOARe
     }
 
     @Override
-    public void updateRegularResult(Long id, Integer result) {
+    public void updateRegularResult(String processInstanceId, Long id, Integer result) {
 
         validateLeaveExists(id);
+        //审核通过 （最后节点）
+        if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) {
+
+            ProcessInstance instance = bpmProcessInstanceService.getProcessInstance(processInstanceId);
+
+            if (instance.isEnded()) {
+
+                // 同步修改用户编制状态为在职状态
+                userApi.updateUserStaffing(Long.valueOf(instance.getStartUserId()), 7);
+            }
+        }
+
         regularMapper.updateById(new BpmOARegularDO().setId(id).setResult(result));
     }
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOAAssetClaimResultListener.java

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.bpm.service.oa.listener;
+
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimService;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimServiceImpl;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * OA 现金支出的结果的监听器实现类
+ *
+ * @author 符溶馨
+ */
+@Component
+public class BpmOAAssetClaimResultListener extends BpmProcessInstanceResultEventListener {
+    @Resource
+    private BpmOAAssetClaimService assetClaimService;
+
+    @Override
+    protected String getProcessDefinitionKey() {
+
+        return BpmOAAssetClaimServiceImpl.PROCESS_KEY;
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceResultEvent event) {
+
+        assetClaimService.updateAssetClaimResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult());
+    }
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOARegularResultListener.java

@@ -27,6 +27,6 @@ public class BpmOARegularResultListener extends BpmProcessInstanceResultEventLis
 
     @Override
     protected void onEvent(BpmProcessInstanceResultEvent event) {
-        regularService.updateRegularResult(Long.parseLong(event.getBusinessKey()), event.getResult());
+        regularService.updateRegularResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult());
     }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEntryDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
@@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOAEntryService;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOARegularService;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOASalaryService;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOASealService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -117,6 +119,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
     @Resource
     private BpmOASalaryService bpmOASalaryService;
 
+    @Resource
+    private BpmOARegularService bpmOARegularService;
+
     @Override
     public PageResult<BpmTaskCCPageItemRespVO> getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) {
         // 查询被抄送的Task
@@ -555,7 +560,17 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             if (salaryDO != null) {
 
                 DeptRespDTO dto = deptApi.getDept(salaryDO.getCompanyDeptId()).getCheckedData();
-                paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂idflag
+                paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂编号flag
+            }
+        }
+
+        // 判断 转正流程时
+        if (instance.getProcessDefinitionId().contains("oa_regular")) {
+            BpmOARegularDO regularDO = bpmOARegularService.getByProcessInstanceId(instance.getProcessInstanceId());
+            if (regularDO != null) {
+
+                DeptRespDTO dto = deptApi.getDept(regularDO.getDeptId()).getCheckedData();
+                paramMap.put("regular_dept_flag", dto.getFlag()); //配置转正部门flag
             }
         }
 

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java

@@ -84,6 +84,13 @@ public interface AdminUserApi {
     void updateFieldworkType(@RequestParam("userId") Long userId,
                          @RequestParam("fieldworkFlag") Integer fieldworkFlag);
 
+    @PostMapping(PREFIX + "/updateUserStaffing")
+    @Operation(summary = "修改用户信息")
+    @Parameter(name = "userId", description = "用户id", example = "1024", required = true)
+    @Parameter(name = "userStaffing", description = "用户编制", example = "1", required = true)
+    void updateUserStaffing(@RequestParam("userId") Long userId,
+                             @RequestParam("userStaffing") Integer userStaffing);
+
     @GetMapping(PREFIX + "/getUserIdsByUserNature")
     @Operation(summary = "获取所有用户性质为外勤的用户")
     @Parameter(name = "userNature", description = "用户性质", example = "3", required = true)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java

@@ -82,6 +82,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
+    @DataPermission(enable = false)
     public void deleteDept(Long factoryId) {
 
         DeptDO deptDO = deptService.getDeptByFactoryId(factoryId);
@@ -92,6 +93,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
+    @DataPermission(enable = false)
     public CommonResult<DeptRespDTO> getDeptByFactoryId(Long factoryId) {
 
         DeptDO deptDO = deptService.getDeptByFactoryId(factoryId);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java

@@ -96,6 +96,12 @@ public class AdminUserApiImpl implements AdminUserApi {
         userService.updateFieldworkType(userId, fieldworkFlag);
     }
 
+    @Override
+    public void updateUserStaffing(Long userId, Integer userStaffing) {
+
+        userService.updateUserStaffing(userId, userStaffing);
+    }
+
     @Override
     public CommonResult<List<Long>> getUserIdsByUserNature(Integer userNature) {
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -128,6 +128,15 @@ public class DeptController {
         return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
     }
 
+    @GetMapping(value = { "/virtually-list"})
+    @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项")
+    public CommonResult<List<DeptSimpleRespVO>> getVirtuallyDeptList() {
+        List<DeptDO> list = deptService.getDeptList(
+                new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
+
+        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+    }
+
     @GetMapping(value = {"/all-list"})
     @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项")
     @DataPermission(enable = false)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/LaborContractController.java

@@ -108,7 +108,6 @@ public class LaborContractController {
 
     @GetMapping("/getSigningDate")
     @Operation(summary = "获得当前登录用户的入职时间和转正时间")
-    @PreAuthorize("@ss.hasPermission('system:labor-contract:query')")
     public CommonResult<SigningDateRespVO> getSigningDate() {
 
         LaborContractDO contractDO = laborContractService.getSigningDate(getLoginUserId());

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/vo/LaborContractPageReqVO.java

@@ -8,6 +8,7 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -23,6 +24,9 @@ public class LaborContractPageReqVO extends PageParam {
     @Schema(description = "部门id", example = "128")
     private Long deptId;
 
+    @Schema(description = "部门id", example = "128")
+    private List<Long> deptIds;
+
     @Schema(description = "签约日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDate[] signingDate;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -152,7 +152,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                         "           AND lc.create_time = max.max_create_time) a on a.user_id = t.id");
         queryWrapper.eq(AdminUserDO::getUserType, 1);
         queryWrapper.likeIfPresent(AdminUserDO::getNickname, pageReqVO.getUserName());
-        queryWrapper.eqIfPresent(AdminUserDO::getDeptId, pageReqVO.getDeptId());
+        queryWrapper.inIfPresent(AdminUserDO::getDeptId, pageReqVO.getDeptIds());
         if (Objects.nonNull(pageReqVO.getSigningDate())) {
             queryWrapper.between("a.signing_date", pageReqVO.getSigningDate()[0], pageReqVO.getSigningDate()[1]);
         }
@@ -162,6 +162,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         queryWrapper.eq(Objects.nonNull(pageReqVO.getStatus()),"a.status", pageReqVO.getStatus());
         queryWrapper.groupBy(AdminUserDO::getId);
         queryWrapper.orderByAsc("a.status");
+        queryWrapper.orderByAsc(AdminUserDO::getId);
 
         return selectJoinPage(mpPage, LaborContractRespVO.class, queryWrapper);
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java

@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogReadDo;
 import cn.iocoder.yudao.module.system.service.worklog.dto.LogReadUserRespDTO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -107,9 +108,76 @@ public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
      * @param type
      * @return
      */
-    LogInstanceRespVO getNextOrUp(@Param("reqVO") LogInstancePageReqVO dto,
+    LogInstanceRespVO getMyNextOrUp(@Param("reqVO") LogInstancePageReqVO dto,
                                   @Param("id") Long id, @Param("userId") Long userId,
                                   @Param("type") Integer type,
-                                  @Param("pagingType") Integer pagingType,
                                   @Param("userIds") List<Long> userIds);
+
+    default IPage<LogInstanceRespVO> getNextOrUp(@Param("reqVO") LogInstancePageReqVO reqVO,
+                                                 @Param("id") Long id,
+                                                 @Param("userId") Long userId,
+                                                 @Param("type") Integer type,
+                                                 @Param("userIds") List<Long> userIds){
+
+        String sql = "";
+
+        MPJLambdaWrapperX<LogInstanceDO> queryWrapper = new MPJLambdaWrapperX<>();
+        queryWrapper.selectAs(LogInstanceDO::getId, LogInstanceRespVO::getId);
+        queryWrapper.selectAs(LogInstanceDO::getName, LogInstanceRespVO::getName);
+        queryWrapper.innerJoin(UserPostDO.class, "userPost", UserPostDO::getUserId, LogInstanceDO::getStartUserId);
+        queryWrapper.innerJoin(DeptDO.class, "dept", DeptDO::getId, LogInstanceDO::getDeptId);
+        queryWrapper.innerJoin(PostDO.class, "post", PostDO::getId, UserPostDO::getPostId);
+        if (type == 1) {
+            sql =   "   (t.time > tt.time) or\n" +
+                    "   (t.time = tt.time and tt.sort > post.sort) or\n" +
+                    "   (t.time = tt.time and tt.sort = post.sort and tt.create_time < t.create_time)";
+
+            queryWrapper.orderByAsc(LogInstanceDO::getTime);
+            queryWrapper.orderByDesc(PostDO::getSort);
+            queryWrapper.orderByAsc(LogInstanceDO::getCreateTime);
+        }
+        if (type == 0) {
+            sql =   "   (t.time < tt.time) or\n" +
+                    "   (t.time = tt.time and tt.sort < post.sort) or\n" +
+                    "   (t.time = tt.time and tt.sort = post.sort and tt.create_time > t.create_time)";
+
+            queryWrapper.orderByDesc(LogInstanceDO::getTime);
+            queryWrapper.orderByAsc(PostDO::getSort);
+            queryWrapper.orderByDesc(LogInstanceDO::getCreateTime);
+        }
+        queryWrapper.innerJoin("(\n" +
+                "SELECT \n" +
+                "   a.id,\n" +
+                "   a.name,\n" +
+                "   a.time,\n" +
+                "   d.sort,\n" +
+                "   a.create_time\n" +
+                "FROM \n" +
+                "   work_log_instance_ext a\n" +
+                "   INNER JOIN system_user_post b ON (b.user_id = a.start_user_id) \n" +
+                "   INNER JOIN system_dept c ON (c.id = a.dept_id) \n" +
+                "   INNER JOIN system_post d ON (d.id = b.post_id) \n" +
+                "WHERE \n" +
+                "   a.id = " + id + "\n" +
+                "   AND a.deleted = 0 \n" +
+                "   AND b.deleted = 0 \n" +
+                "   AND c.deleted = 0 \n" +
+                "   AND d.deleted = 0\n" +
+                ") tt on \n" + sql);
+        queryWrapper.eqIfPresent(LogInstanceDO::getDeptId, reqVO.getDeptId());
+        queryWrapper.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId());
+        queryWrapper.eqIfPresent(LogInstanceDO::getStartUserId, reqVO.getStartUserId());
+        queryWrapper.betweenIfPresent(LogInstanceDO::getTime, reqVO.getCreateTime());
+        queryWrapper.inIfPresent(LogInstanceDO::getStartUserId, userIds);
+        queryWrapper.ne(LogInstanceDO::getStartUserId, userId);
+
+        if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 1) {
+            queryWrapper.like(DeptDO::getFlag, "166");
+        }
+        if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 2) {
+            queryWrapper.notLike(DeptDO::getFlag, "166");
+        }
+
+        return selectJoinPage(new Page<>(1, 1), LogInstanceRespVO.class, queryWrapper);
+    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java

@@ -31,6 +31,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -115,7 +116,7 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService {
         List<CommentPageListVO> records = pageList.getRecords();
         if (dto.getIsShowWorkLogContent() != null && dto.getIsShowWorkLogContent() == 1 && !records.isEmpty()) {
             //模版ids过滤
-            List<Long> workFormIds = records.stream().map(CommentPageListVO::getWorkFormId).collect(Collectors.toList());
+            Set<Long> workFormIds = records.stream().map(CommentPageListVO::getWorkFormId).collect(Collectors.toSet());
             //  查询模版列表
             List<LogFormDO> formList = logFormService.getFormList(workFormIds);
             Map<Long, LogFormDO> formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -311,6 +311,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
+    @DataPermission(enable = false)
     public DeptDO getDeptByFactoryId(Long factoryId) {
 
         return deptMapper.selectOne(DeptDO::getFactoryId, factoryId);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java

@@ -7,9 +7,11 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.laborcontract.LaborContractDO;
 import cn.iocoder.yudao.module.system.dal.mysql.laborcontract.LaborContractMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LABOR_CONTRACT_NOT_EXISTS;
 
 /**
@@ -38,6 +41,9 @@ public class LaborContractServiceImpl implements LaborContractService {
     @Resource
     private AdminUserMapper userMapper;
 
+    @Resource
+    private DeptService deptService;
+
     @Override
     public Long createLaborContract(LaborContractSaveReqVO createReqVO) {
         // 插入
@@ -94,6 +100,13 @@ public class LaborContractServiceImpl implements LaborContractService {
     @Override
     public PageResult<LaborContractRespVO> getLaborContractPage(LaborContractPageReqVO pageReqVO) {
 
+        if (pageReqVO.getDeptId() != null) {
+
+            // 获取所有子级部门
+            List<DeptDO> deptDOS = deptService.getChildDept(pageReqVO.getDeptId());
+            pageReqVO.setDeptIds(convertList(deptDOS, DeptDO::getId));
+        }
+
         Page<LaborContractRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         IPage<LaborContractRespVO> pageList = userMapper.selectContractPage(page, pageReqVO);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java

@@ -102,6 +102,14 @@ public interface AdminUserService {
      */
     void updateFieldwork(Long id, Integer fieldworkFlag);
 
+    /**
+     * 修改用户编制
+     *
+     * @param id            用户编号
+     * @param userStaffing  编制
+     */
+    void updateUserStaffing(Long id, Integer userStaffing);
+
     /**
      * 修改外勤打卡状态
      * 用于临时开启外勤打卡

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -18,8 +18,6 @@ import cn.iocoder.yudao.framework.common.util.string.StrUtils;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
-import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
-import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.system.controller.admin.user.dto.UserPageDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.factoryUser.FactoryUserPageReqVO;
@@ -278,6 +276,12 @@ public class AdminUserServiceImpl implements AdminUserService {
         userMapper.updateById(updateObj);
     }
 
+    @Override
+    public void updateUserStaffing(Long id, Integer userStaffing) {
+
+        userMapper.updateById(new AdminUserDO().setId(id).setUserStaffing(userStaffing));
+    }
+
     @Override
     public void updateFieldworkType(Long id, Integer fieldworkFlag) {
         // 更新状态

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.service.worklog;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -256,14 +257,14 @@ public class LogInstanceServiceImpl implements LogInstanceService {
         if (!records.isEmpty()) {
 
             //模版ids过滤
-            List<Long> workFormIds = records.stream().map(LogInstanceRespVO::getFormId).collect(Collectors.toList());
+            Set<Long> workFormIds = records.stream().map(LogInstanceRespVO::getFormId).collect(Collectors.toSet());
 
             //  查询模版列表
             List<LogFormDO> formList = logFormService.getFormList(workFormIds);
             Map<Long, LogFormDO> formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item));
 
             //查询用户信息列表
-            List<Long> userIds = records.stream().map(LogInstanceRespVO::getStartUserId).collect(Collectors.toList());
+            Set<Long> userIds = records.stream().map(LogInstanceRespVO::getStartUserId).collect(Collectors.toSet());
             Map<Long, AdminUserDO> userMap = adminUserService.getUserMap(userIds);
 
             //遍历
@@ -400,10 +401,26 @@ public class LogInstanceServiceImpl implements LogInstanceService {
             //以及岗位为总监或副总监的用户
             leaderUserIds = adminUserService.getUserByBoss();
         }
-        LogInstanceRespVO upLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, pagingType, leaderUserIds);
+        if (pagingType == 0) {
-        LogInstanceRespVO nextLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, pagingType, leaderUserIds);
+            IPage<LogInstanceRespVO> upLogInstances = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, leaderUserIds);
+            IPage<LogInstanceRespVO> nextLogInstances = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, leaderUserIds);
+
+            if (CollectionUtil.isNotEmpty(upLogInstances.getRecords())) {
+                vo.setUpLogInstance(upLogInstances.getRecords().get(0));
+            }
+            if (CollectionUtil.isNotEmpty(nextLogInstances.getRecords())) {
+                vo.setNextLogInstance(nextLogInstances.getRecords().get(0));
+            }
+        }
+
+        if (pagingType == 1) {
+            LogInstanceRespVO upLogInstance = logInstanceMapper.getMyNextOrUp(dto, id, getLoginUserId(), 1, leaderUserIds);
+            LogInstanceRespVO nextLogInstance = logInstanceMapper.getMyNextOrUp(dto, id, getLoginUserId(), 0, leaderUserIds);
+
             vo.setUpLogInstance(upLogInstance);
             vo.setNextLogInstance(nextLogInstance);
+        }
+
         //获取日志详情
         return vo;
     }

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml

@@ -94,61 +94,66 @@
         or  result.data_scope = 1 )
     </select>
 
-    <select id="getNextOrUp"
+    <select id="getMyNextOrUp"
             resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
         SELECT
-        a.id,
+            t.id,
-        a.name
+            t.name
         FROM
-        work_log_instance_ext AS a
+            work_log_instance_ext AS t
-        LEFT JOIN work_log_read AS e ON a.id = e.log_instance_id
+            INNER JOIN (
-        AND e.read_user_id = #{userId}
+                SELECT
-        <where>
+                    a.time,
-            a.deleted = 0
+                    a.create_time
-            <if test="type == 0">
+                FROM
-                and a.id &lt; #{id}
+                    work_log_instance_ext a
-            </if>
+                WHERE
+                    a.id = #{id}
+            ) tt ON
                 <if test="type == 1">
-                and a.id &gt; #{id}
+                    ( t.time &gt; tt.time )
+                    OR ( t.time = tt.time  AND tt.create_time &lt; t.create_time )
                 </if>
+                <if test="type == 0">
+                    ( t.time &lt; tt.time )
+                    OR ( t.time = tt.time  AND tt.create_time &gt; t.create_time )
+                </if>
+        <where>
+            t.deleted = 0
+            AND t.start_user_id = #{userId}
             <if test="reqVO.type != null">
-                and a.type = #{reqVO.type}
+                and t.type = #{reqVO.type}
             </if>
             <if test="reqVO.deptId != null">
-                and a.dept_id = #{reqVO.deptId}
+                and t.dept_id = #{reqVO.deptId}
             </if>
             <if test="reqVO.startUserId != null">
-                and a.start_user_id = #{reqVO.startUserId}
+                and t.start_user_id = #{reqVO.startUserId}
             </if>
             <if test="reqVO.createTime != null and reqVO.createTime.length > 0">
                 <if test="reqVO.createTime[0] != null">
-                    and a.create_time &gt;= #{reqVO.createTime[0]}
+                    and t.create_time &gt;= #{reqVO.createTime[0]}
                 </if>
                 <if test="reqVO.createTime[1] != null">
-                    and a.create_time &lt;= #{reqVO.createTime[1]}
+                    and t.create_time &lt;= #{reqVO.createTime[1]}
                 </if>
             </if>
-            <if test="reqVO.readStatus != null">
-                and e.read_status = #{reqVO.readStatus}
-            </if>
-            <if test="pagingType == 0">
-                and a.start_user_id != #{userId}
-            </if>
-            <if test="pagingType == 1">
-                and a.start_user_id = #{userId}
-            </if>
             <if test="reqVO.isBoss != null">
-                and a.start_user_id in
+                and t.start_user_id in
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}
                 </foreach>
             </if>
         </where>
         <if test="type == 0">
-            order by id desc
+            ORDER BY
+                t.time DESC,
+                t.create_time DESC
         </if>
         <if test="type == 1">
-            order by id asc
+            ORDER BY
+                t.time,
+                t.create_time
         </if>
         limit 1
     </select>
@@ -156,13 +161,11 @@
     <select id="selectMyPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
         SELECT
         a.*,
-        e.read_status as readStatus,
         COALESCE(c.readCount, 0) as readCount,
         COALESCE(d.unreadCount, 0) as unReadCount,
         COALESCE(b.comment, 0) as comment
         FROM
         work_log_instance_ext as a
-        LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}
         LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 AND deleted = 0 GROUP BY log_instance_id ) AS c ON a.id = c.log_instance_id
         LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 AND deleted = 0 GROUP BY log_instance_id ) AS d ON a.id = d.log_instance_id
         LEFT JOIN (SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment where deleted = 0  GROUP BY work_log_id) AS b ON a.id = b.work_log_id