编辑5

application/index/controller/Auth.php

@@ -233,8 +233,12 @@ class Auth extends Basic
         $data['title']='权限分配';
 //        echo $group_id;
 //        exit;
+<<<<<<< HEAD
         if (IS_POST && $group_id=0) {
 >>>>>>> 8e62fd6... 合并test
+=======
+        if (IS_POST && $group_id==0) {
+>>>>>>> cb14688... 编辑5
             //添加or修改
             $data['id']    = $group_id;
             $menu_auth     = input('post.menu_auth/a','');//获取所有授权菜单id

public/resource/js/auth_rule_box.js

@@ -64,6 +64,26 @@ define (['doT', 'text!temp/auth_rule_box_template_tpl.html', 'css!style/home.css
 
                     }
                 }
+            });
+            var id=  getUrlParam('id');
+            $.ajax({
+                url: '/index/updateAuthRule/group_id/'+id,
+                type: 'post',
+                async: true,
+                dataType: 'json',
+                success: function (data) {
+                    $("input[name = id]").val(data.data.id);
+                    $("input[name = title]").val(data.data.title);
+                    $("input[name = name]").val(data.data.name);
+                    $("input[name = sort]").val(data.data.sort);
+                    $("#pid").val(data.data.pid);
+                    if(data.data.is_menu==0){
+                        $("#is_menu2").attr('checked',true);
+                    }else{
+                        $("#is_menu1").attr('checked',true);
+
+                    }
+                }
             })
 
         }