角色删除判断是否有人员

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -18,15 +18,10 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.PmsUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.entity.SysRolePermission;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.model.TreeModel;
-import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
-import org.jeecg.modules.system.service.ISysPermissionService;
-import org.jeecg.modules.system.service.ISysRolePermissionService;
-import org.jeecg.modules.system.service.ISysRoleService;
+import org.jeecg.modules.system.service.*;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -72,7 +67,8 @@ public class SysRoleController {
 	
 	@Autowired
 	private ISysPermissionDataRuleService sysPermissionDataRuleService;
-	
+	@Autowired
+	private ISysUserService sysUserService;
 	@Autowired
 	private ISysRolePermissionService sysRolePermissionService;
 	
@@ -196,6 +192,12 @@ public class SysRoleController {
 	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		//删除前判断是否有 用户使用
+		Page<SysUser> page = new Page<SysUser>(1, 10);
+		IPage<SysUser> pageList = sysUserService.getUserByRoleId(page,id,null,null);
+		if (!pageList.getRecords().isEmpty()){
+			return Result.error("角色下还有用户不可删除!!!");
+		}
 		boolean b = sysRoleService.deleteRole(id);
 		if (b){
 			return Result.ok("删除角色成功");