Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Merge remote-tracking branch 'origin/dev_PMS' into dev_PMS 

# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
This commit is contained in:
wanjia 2024-01-31 13:51:18 +08:00
parent 77a4317d39 531070a4ab
commit c032d22e97
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/controller/PmsProjectController.java
View File

@ -104,7 +104,7 @@ public class PmsProjectController extends BaseController
return toAjax(pmsProjectService.deletePmsProjectByIds(ids));
}
@RequiresPermissions(value = {"system:notice:add","pms:pmsProject:noticeAdd"} ,logical = Logical.OR)
@RequiresPermissions(value = {"system:notice:add", "pms:pmsProject:noticeManage"}, logical = Logical.OR)
@PostMapping("/addNotice")
@ApiModelProperty(value = "添加项目公告")
public AjaxResult addProjectNotice( @RequestBody @Validated PmsProjectNoticeInputVo pmsProjectNoticeInputVo) {

2
ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java
View File

@ -125,7 +125,7 @@ public class PmsProjectRepositoryServiceImpl implements IPmsProjectRepositorySer
pmsProjectService.selectAndCheckPmsProjectById(pmsProjectRepository.getPmsProjectId());
//仓库已被关联，返回错误提示
if (pmsProjectRepositoryMapper.countPmsProjectRepositoryByProjectRepositoryId(pmsProjectRepository.getProjectRepositoryId()) > 0) {
throw new ServiceException("代码库id:[%s]已被关联");
throw new ServiceException("代码库id:[%s]已被关联", pmsProjectRepository.getProjectRepositoryId());
}
return pmsProjectRepositoryMapper.insertPmsProjectRepository(pmsProjectRepository);
}

2
ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/utils/PmsGitLinkRequestUrl.java
View File

@ -51,7 +51,7 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl {
* 获取或更新组织
*/
public static GitLinkRequestUrl GET_OR_PATCH_ORGANIZATION(Long gitlinkOrgId) {
return getGitLinkRequestUrl(String.format("/api/organizations/%d.json", gitlinkOrgId));
return getAdminGitLinkRequestUrl(String.format("/api/organizations/%d.json", gitlinkOrgId));
}
/**

11
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
View File

@ -1,7 +1,5 @@
package com.ruoyi.system.controller;
import java.util.List;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import io.swagger.annotations.ApiOperation;
@ -20,11 +18,14 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
import java.util.List;
/**
* 公告 信息操作处理
*
@ -52,7 +53,7 @@ public class SysNoticeController extends BaseController
/**
* 根据通知公告编号获取详细信息
*/
@RequiresPermissions("system:notice:query")
@RequiresPermissions(value = {"system:notice:query", "pms:pmsProject:show", "pms:pmsProject:showMe"}, logical = Logical.OR)
@GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId)
{
@ -87,7 +88,7 @@ public class SysNoticeController extends BaseController
/**
* 修改通知公告
*/
@RequiresPermissions("system:notice:edit")
@RequiresPermissions(value = {"system:notice:edit", "pms:pmsProject:noticeManage"}, logical = Logical.OR)
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysNotice notice)
@ -99,7 +100,7 @@ public class SysNoticeController extends BaseController
/**
* 删除通知公告
*/
@RequiresPermissions("system:notice:remove")
@RequiresPermissions(value = {"system:notice:remove", "pms:pmsProject:noticeManage"}, logical = Logical.OR)
@Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds)

10
sql/update/20240131102348_pms_menu_add_notice_manage.sql Normal file
View File

@ -0,0 +1,10 @@
-- 项目管理菜单增加通知公告管理
SET FOREIGN_KEY_CHECKS = 0;
INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`,
`is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
`update_by`, `update_time`, `remark`, `dept_type`)
VALUES (3060, '编辑项目公告', 3015, 27, '', NULL, NULL, 1, 0, 'F', '0', '0', 'pms:pmsProject:noticeManage', '#',
'admin', '2024-01-26 14:28:05', '', NULL, '', 2);
SET FOREIGN_KEY_CHECKS = 1;