|
|
@@ -3,15 +3,13 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.txz.backstage.core.ResultCode;
|
|
|
import com.txz.backstage.core.ResultGenerator;
|
|
|
-import com.txz.backstage.model.Permission;
|
|
|
-import com.txz.backstage.model.RolePermission;
|
|
|
-import com.txz.backstage.model.User;
|
|
|
+import com.txz.backstage.model.*;
|
|
|
import com.txz.backstage.service.PermissionService;
|
|
|
import com.txz.backstage.service.RolePermissionService;
|
|
|
+import com.txz.backstage.service.UserRoleService;
|
|
|
import com.txz.backstage.util.UserUtil;
|
|
|
import com.txz.backstage.web.para.PermissionBo;
|
|
|
import com.txz.core.Result;
|
|
|
-import com.txz.backstage.model.Role;
|
|
|
import com.txz.backstage.service.RoleService;
|
|
|
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
@@ -59,6 +57,9 @@ public class RoleController {
|
|
|
@Resource
|
|
|
private RolePermissionService rolePermissionService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private UserRoleService userRoleService ;
|
|
|
+
|
|
|
@PostMapping("/add")
|
|
|
@ApiOperation(value = "role新增",httpMethod = "POST")
|
|
|
public Result add(@RequestBody Role role, ServerHttpRequest request) {
|
|
|
@@ -97,6 +98,9 @@ public class RoleController {
|
|
|
return ResultGenerator.genFailResult(ResultCode.ADMIN_ROLE_UNDELETE);
|
|
|
}
|
|
|
roleService.deleteById(id);
|
|
|
+ Condition c = new Condition(UserRole.class);
|
|
|
+ c.createCriteria().andEqualTo("roleId",id);
|
|
|
+ userRoleService.deleteByCondition(c);
|
|
|
} catch (Exception e) {
|
|
|
log.error("删除对象操作异常e:{}",e);
|
|
|
return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
|
