Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/MenuServiceImpl.java

@@ -36,6 +36,9 @@ public class MenuServiceImpl implements MenuService {
             if (Blank.isNotEmpty(menuDao.getMenuByUrl(menu.getMenuUrl()))) {
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该菜单路径已被使用，请更换其他菜单路径");
             }
+            if (Blank.isNotEmpty(menuDao.getMenuByName(menu.getMenuName()))) {
+                return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "菜单名被占用，请跟换其他名字");
+            }
         }
         //新增菜单，默认为可用
         menu.setMenuStatus(ConstantStr.MENU_AVAILABLE);

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RoleServiceImpl.java

@@ -152,10 +152,14 @@ public class RoleServiceImpl implements RoleService {
         if (deleteRoleIdS.size()>0){
             Integer count = roleDao.deleteRole(deleteRoleIdS);
             jsonObject.put("count",count);
+        }else{
+            jsonObject.put("count",0);
         }
         if (deleteNotRoleIdS.size()>0){
             List<Role> roles = roleDao.queryRoleByRoleIds(deleteNotRoleIdS);
             jsonObject.put("rolesNot",roles);
+        }else {
+            jsonObject.put("rolesNot",null);
         }
         return Result.ok(jsonObject);
     }