Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -77,39 +77,39 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean updateUserAuthMenu(Integer roleID, List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgid) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == roleID){
-            addUserAuthMenu( sysMenuList,name,orgid);
-        }else {
-
-//            // 人员
-//            TaUser taUser = taUserMapper.selectById(userId);
-//            if (null == taUser) {
-//                responseBean.addError("授权人不存在");
-//                return responseBean;
-//            }
-            try {
-                //授权菜单，先删除在新增
-                taUserAuthMenuMapper.deleteUserAuthMenu(roleID);
-                for (SysMenu sysMenu: sysMenuList) {
-                    TaRoleMenu taRoleMenu = new TaRoleMenu();
-                    taRoleMenu.setRoleId(userId);
-                    taRoleMenu.setMenuId(sysMenu.getMenuId());
-                    taRoleMenuMapper.insert(taRoleMenu);
-                }
-                    responseBean.addSuccess("操作成功");
-                return responseBean;
-            } catch (Exception e) {
-                responseBean.addSuccess("操作失败");
-                e.printStackTrace();
-                return responseBean;
+        if (null == roleId){
+            Boolean isA = addUserAuthMenu( sysMenuList,name,orgid);
+            responseBean.addSuccess(isA==true?"成功":"失败");
+            return responseBean;
+        }
+        try {
+            //授权菜单，先删除在新增
+            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            for (SysMenu sysMenu: sysMenuList) {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(roleId);
+                taRoleMenu.setMenuId(sysMenu.getMenuId());
+                taRoleMenuMapper.insert(taRoleMenu);
             }
+            // 更新Role
+            TaRole taRole = new TaRole();
+            taRole.setRoleId(roleId);
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgid);
+            taRole.
+            taRoleMapper.updateById(taRole);
+            responseBean.addSuccess("操作成功");
+            return responseBean;
+        } catch (Exception e) {
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
         }
-        return responseBean;
     }
 
-    public ResponseBean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
         ResponseBean responseBean = new ResponseBean();
         try{
             TaRole taRole = new TaRole();
@@ -123,14 +123,11 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
               taRoleMenuMapper.insert(taRoleMenu);
           }
             responseBean.addSuccess("操作成功");
-            return  responseBean;
+            return  true;
         }catch (Exception e){
             responseBean.addSuccess("操作失败");
             e.printStackTrace();
-            return responseBean;
+            return false;
         }
-
     }
-
-
 }