修复角色bug

zhoushan-system-api/src/main/java/com/fdage/controller/ExhibitionController.java

@@ -53,12 +53,19 @@ public class ExhibitionController {
             @ApiImplicitParam(name = "collectionId", value = "文物id", dataType = "String")})
     public AjaxJson insertExhibitionCollection(@RequestBody RequestExhibition bo){
         if(bo == null || bo.getExhibitionId() == null || StringUtils.isEmpty(bo.getCollectionId())){
+
+//        if(bo == null || bo.getExhibitionId() == null){
             return AjaxJson.failure(ResponEnum.NOT_NULL.getCode(), ResponEnum.NOT_NULL.getMessage());
         }
         String[] ids = bo.getCollectionId().split(",");
+
         TbExhibitionCollection exhibitionCollection = new TbExhibitionCollection();
         for(int i = 0, len = ids.length; i < len; i++){
             exhibitionCollection.setExhibitionId(bo.getExhibitionId());
+            // 2021-08-16 by owen
+//            if (ids.length > 1) {
+//                exhibitionCollection.setCollectionId(Long.valueOf(ids[i]));
+//            }
             exhibitionCollection.setCollectionId(Long.valueOf(ids[i]));
             service.insertExhibitionCollection(exhibitionCollection);
         }

zhoushan-system-api/src/main/java/com/fdage/controller/RoleController.java

@@ -2,11 +2,13 @@ package com.fdage.controller;
 
 import com.fdage.aop.WebControllerLog;
 import com.fdage.pojo.TbRole;
+import com.fdage.pojo.TbUser;
 import com.fdage.request.RequestBase;
 import com.fdage.request.RequestRole;
 import com.fdage.respon.ResponRole;
 import com.fdage.service.IResourceService;
 import com.fdage.service.IRoleService;
+import com.fdage.service.IUserService;
 import com.fdage.util.AjaxJson;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -40,6 +42,11 @@ public class RoleController {
     @Autowired
     private IResourceService resourceService;
 
+    @Autowired
+    private IUserService userService;
+
+
+
     @PostMapping("save")
     @ResponseBody
     @WebControllerLog(description = "角色管理-新增/修改角色")
@@ -78,6 +85,15 @@ public class RoleController {
 
             }
             BeanUtils.copyProperties(param, roleEntity);
+
+            // 2021-8-16 检查该角色是否被用户使用
+            if (roleEntity.getState() == 1){
+                if (checkUseRole(roleEntity.getId())) {
+                    return AjaxJson.failure("当前角色还有关联用户，请先处理用户角色");
+                }
+            }
+
+
             n = roleService.update(roleEntity);
 
             // 每次修改，删除角色资源表信息，重新添加
@@ -97,6 +113,16 @@ public class RoleController {
         return AjaxJson.failure("新增角色失败");
     }
 
+
+    private Boolean checkUseRole(Long id){
+        List<String> list = roleService.findUserNameByRoleId(id);
+        if(list != null && list.size() > 0){
+            return true;
+//            return AjaxJson.failure("当前角色还有关联用户，请先处理用户角色");
+        }
+        return false;
+    }
+
     @PostMapping("list")
     @ResponseBody
     @WebControllerLog(description = "角色管理-获取角色列表")