修改用户角色模型

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java

@@ -1,6 +1,9 @@
 package cn.com.qmth.examcloud.service.core.api;
 
+import cn.com.qmth.examcloud.common.uac.annotation.Uac;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
+import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
+import cn.com.qmth.examcloud.common.uac.enums.UacPolicy;
 import cn.com.qmth.examcloud.service.core.entity.User;
 import cn.com.qmth.examcloud.service.core.enums.UserScope;
 import cn.com.qmth.examcloud.service.core.enums.UserType;
@@ -138,6 +141,7 @@ public class UserApi {
 
     @ApiOperation(value="按id删除用户",notes="删除")
     @DeleteMapping("/{ids}")
+    @Uac(roles = {RoleMeta.SUPER_ADMIN},policy = UacPolicy.IN)
     public ResponseEntity deleteUser(@PathVariable String ids){
         List<Long> userIds = Stream.of(ids.split(",")).map(s->Long.parseLong(s.trim()))
                 .collect(Collectors.toList());

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/UserService.java

@@ -172,6 +172,7 @@ public class UserService {
         userInfo.setRootOrgName(rootOrg.getName());
         userInfo.setToken(token);
         userInfo.setType(user.getType().toString());
+        userInfo.setUserRoles(user.getUserRoles());
         return userInfo;
     }
 

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dto/UserInfo.java

@@ -1,6 +1,9 @@
 package cn.com.qmth.examcloud.service.core.dto;
 
+import cn.com.qmth.examcloud.service.core.entity.UserRole;
+
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Created by songyue on 17/2/22.
@@ -34,6 +37,8 @@ public class UserInfo implements Serializable{
     
     private String photoPath;
 
+    private List<UserRole> userRoles;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -142,6 +147,14 @@ public class UserInfo implements Serializable{
 		this.photoPath = photoPath;
 	}
 
-	public UserInfo() {
+    public List<UserRole> getUserRoles() {
+        return userRoles;
+    }
+
+    public void setUserRoles(List<UserRole> userRoles) {
+        this.userRoles = userRoles;
+    }
+
+    public UserInfo() {
     }
 }