|
@@ -7,6 +7,7 @@ import com.energy.manage.common.po.system.SysRolePO;
|
|
import com.energy.manage.common.reponse.RespMsg;
|
|
import com.energy.manage.common.reponse.RespMsg;
|
|
import com.energy.manage.common.reponse.ResultResp;
|
|
import com.energy.manage.common.reponse.ResultResp;
|
|
import com.energy.manage.service.config.annotations.UserLoginToken;
|
|
import com.energy.manage.service.config.annotations.UserLoginToken;
|
|
|
|
+import com.energy.manage.service.controller.base.BaseServiceController;
|
|
import com.energy.manage.service.domain.dto.system.*;
|
|
import com.energy.manage.service.domain.dto.system.*;
|
|
import com.energy.manage.service.domain.vo.system.PermissionVo;
|
|
import com.energy.manage.service.domain.vo.system.PermissionVo;
|
|
import com.energy.manage.service.domain.vo.system.SysRelationVo;
|
|
import com.energy.manage.service.domain.vo.system.SysRelationVo;
|
|
@@ -35,7 +36,7 @@ import java.util.Optional;
|
|
@RequestMapping("sysrole")
|
|
@RequestMapping("sysrole")
|
|
@CrossOrigin
|
|
@CrossOrigin
|
|
@Api(value = "SysRoleController", tags = "系统角色管理")
|
|
@Api(value = "SysRoleController", tags = "系统角色管理")
|
|
-public class SysRoleController {
|
|
|
|
|
|
+public class SysRoleController extends BaseServiceController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private SysRoleService sysRoleService;
|
|
private SysRoleService sysRoleService;
|
|
@@ -216,7 +217,7 @@ public class SysRoleController {
|
|
if (!Optional.ofNullable(roleUpdateOrganizationDto.getRoleId()).isPresent() || CollectionUtils.isEmpty(roleUpdateOrganizationDto.getOrganizationCodes())) {
|
|
if (!Optional.ofNullable(roleUpdateOrganizationDto.getRoleId()).isPresent() || CollectionUtils.isEmpty(roleUpdateOrganizationDto.getOrganizationCodes())) {
|
|
return ResultResp.NOTNULLPARAM();
|
|
return ResultResp.NOTNULLPARAM();
|
|
}
|
|
}
|
|
- boolean flag = permissionService.updateRoleOrganization(roleUpdateOrganizationDto.getRoleId(), roleUpdateOrganizationDto.getOrganizationCodes());
|
|
|
|
|
|
+ boolean flag = permissionService.updateRoleOrganization(roleUpdateOrganizationDto.getRoleId(), roleUpdateOrganizationDto.getOrganizationCodes(),getUserId());
|
|
if (flag) {
|
|
if (flag) {
|
|
return ResultResp.SUCCESS();
|
|
return ResultResp.SUCCESS();
|
|
}
|
|
}
|