射洪城投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
1 天以前 50ee6ccb8d8036ffaa2aabb4e4999c14a05b45a3 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java


@@ -5,11 +5,13 @@


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.enums.BusinessType;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.system.dto.dispose.OaApprovalApplicationDisposeDTO;


import com.ruoyi.system.constants.AssetDeptConstant;


import com.ruoyi.system.dto.asset.OaApprovalApplicationDisposeDTO;


import com.ruoyi.system.query.OaApprovalApplicationDisposePageQuery;


import com.ruoyi.system.service.OaApprovalApplicationDisposeService;


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.vo.dispose.OaApprovalApplicationDisposePageVO;


import com.ruoyi.system.service.OaApprovalApplicationDisposeService;


import com.ruoyi.system.vo.asset.OaApprovalApplicationDisposeDetailVO;


import com.ruoyi.system.vo.asset.OaApprovalApplicationDisposePageVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


@@ -17,6 +19,7 @@


import org.springframework.context.annotation.Lazy;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


@@ -64,7 +67,7 @@


                String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();


                


                // 非超级管理员且非资产管理部，设置部门权限


                if (!"资产管理部".equals(deptName)) {


                if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {


                    pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));


                }


            } catch (Exception e) {


@@ -87,5 +90,12 @@


        oaApprovalApplicationDisposeService.deleteByApplicationId(id);


        return R.ok();


    }




    @ApiOperation("获取资产处置申请详情")


    @GetMapping("/detail/{id}")


    public R<OaApprovalApplicationDisposeDetailVO> getDisposeDetail(@ApiParam(name = "id", value = "申请单ID", required = true) @PathVariable Integer id) {


        OaApprovalApplicationDisposeDetailVO detail = oaApprovalApplicationDisposeService.getDisposeDetail(id);


        return R.ok(detail);


    }


}