.....

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/RolePrivilegeController.java

@@ -33,13 +33,11 @@ import cn.com.qmth.examcloud.core.basic.api.controller.bean.PrivilegeGroupDomain
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.RoleDomain;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UpdateRolePrivilegeRelationsDomain;
 import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
-import cn.com.qmth.examcloud.core.basic.dao.AppRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.PrivilegeGroupRepo;
 import cn.com.qmth.examcloud.core.basic.dao.PrivilegeRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RolePrivilegeRelationRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.AppEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeGroupEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
@@ -69,9 +67,6 @@ public class RolePrivilegeController extends ControllerSupport {
 	private static List<String> disabledCodeList = Arrays
 			.asList(new String[]{"index_privilege_group_list", "index_app_list", "index_school"});
 
-	@Autowired
-	AppRepo appRepo;
-
 	@Autowired
 	PrivilegeGroupRepo privilegeGroupRepo;
 
@@ -201,11 +196,6 @@ public class RolePrivilegeController extends ControllerSupport {
 		for (PrivilegeGroupEntity cur : list) {
 			PrivilegeGroupDomain bean = new PrivilegeGroupDomain();
 			bean.setId(cur.getId());
-			bean.setAppId(cur.getAppId());
-			AppEntity app = GlobalHelper.getEntity(appRepo, cur.getAppId(), AppEntity.class);
-			if (null != app) {
-				bean.setAppName(app.getName());
-			}
 			bean.setCode(cur.getCode());
 			bean.setName(cur.getName());
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/PrivilegeGroupDomain.java

@@ -28,16 +28,6 @@ public class PrivilegeGroupDomain implements JsonSerializable {
 	 */
 	private String code;
 
-	/**
-	 * 应用ID
-	 */
-	private Long appId;
-
-	/**
-	 * 应用名称
-	 */
-	private String appName;
-
 	/**
 	 * 顶级机构ID
 	 */
@@ -72,22 +62,6 @@ public class PrivilegeGroupDomain implements JsonSerializable {
 		this.code = code;
 	}
 
-	public Long getAppId() {
-		return appId;
-	}
-
-	public void setAppId(Long appId) {
-		this.appId = appId;
-	}
-
-	public String getAppName() {
-		return appName;
-	}
-
-	public void setAppName(String appName) {
-		this.appName = appName;
-	}
-
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/PrivilegeGroupEntity.java

@@ -41,12 +41,6 @@ public class PrivilegeGroupEntity extends JpaEntity {
 	@Column(unique = true, nullable = false)
 	private String code;
 
-	/**
-	 * 应用
-	 */
-	@Column(unique = false, nullable = false)
-	private Long appId;
-
 	public Long getId() {
 		return id;
 	}
@@ -71,12 +65,4 @@ public class PrivilegeGroupEntity extends JpaEntity {
 		this.code = code;
 	}
 
-	public Long getAppId() {
-		return appId;
-	}
-
-	public void setAppId(Long appId) {
-		this.appId = appId;
-	}
-
 }