diff --git a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java index af736db7..eb634833 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java @@ -40,7 +40,7 @@ public interface IProRoleService { void deleteRoleByProjectId(Long projectId) throws Exception; - RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception; + ProjectVo.RoleInfo saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception; ProjectVo.RoleInfo updateRole(Long currentUserId, RoleDto.UpdateRole updateRole) throws Exception; diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 0b3a440c..83d40125 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -599,7 +599,7 @@ public class ProRoleService implements IProRoleService { @Override - public RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception { + public ProjectVo.RoleInfo saveRole(Long currentUserId, RoleDto.SaveRole saveRole) throws Exception { //检查操作者的权限 int power = selectPowerByRoleName(currentUserId, saveRole.getProjectId()); if (power < 2) { @@ -626,7 +626,8 @@ public class ProRoleService implements IProRoleService { //发送系统消息 robotService.addRoleRobotSend(currentUserId,saveRole.getProjectId(),saveRole.getRoleName(),roleInfo.getRoleId()); - return roleInfo; +// getRoleInfoByRoleId(role.getId()); + return getRoleInfoByRoleId(role.getId()); } @Override diff --git a/tall/src/main/java/com/ccsens/tall/web/RoleController.java b/tall/src/main/java/com/ccsens/tall/web/RoleController.java index 5b9fe80a..dba40607 100644 --- a/tall/src/main/java/com/ccsens/tall/web/RoleController.java +++ b/tall/src/main/java/com/ccsens/tall/web/RoleController.java @@ -53,10 +53,10 @@ public class RoleController { @ApiImplicitParams({ }) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveRole(HttpServletRequest request, + public JsonResponse saveRole(HttpServletRequest request, @ApiParam @Validated @RequestBody RoleDto.SaveRole saveRole) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - RoleVo.RoleByProjectId roleInfo = proRoleService.saveRole(currentUserId,saveRole); + ProjectVo.RoleInfo roleInfo = proRoleService.saveRole(currentUserId,saveRole); return JsonResponse.newInstance().ok(roleInfo); } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common