Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 c3a11538b96aeac198fbaa467210ef8754773ad1

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java

@@ -3,10 +3,13 @@

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SetDeptDTO;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalService;
import com.ruoyi.system.vo.system.ApprovalVO;
import io.swagger.annotations.Api;
@@ -14,6 +17,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * <p>
@@ -29,6 +34,10 @@
public class OaApprovalController {
    @Resource
    private OaApprovalService oaApprovalService;
    @Resource
    private ISysUserService sysUserService;
    @Resource
    private TokenService tokenService;

    /**
     * 获取部门树列表
@@ -38,6 +47,27 @@
    public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
        return R.ok( oaApprovalService.pageList(query));
    }
    @ApiOperation("流程设计不分页列表")
    @PostMapping("/listAll")
    public R<List<OaApproval>> listAll() {
        List<OaApproval> res = new ArrayList<>();
        List<OaApproval> approvals = oaApprovalService.list();
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser sysUser = sysUserService.selectUserById(userId);
        String deptId = sysUser.getDeptId();
        for (OaApproval approval : approvals) {
            if (approval.getDeptIds().equals("-1")){
                res.add(approval);
            }else{
                for (String s : approval.getDeptIds().split(",")) {
                    if (s.equals(deptId)){
                        res.add(approval);
                    }
                }
            }
        }
        return R.ok(res );
    }
    @ApiOperation(value = "启用禁用")
    @GetMapping(value = "/updateStatus")
    public R updateStatus(Integer id ) {