Merge branch 'master' of https://git.oschina.net/cyf783/guns

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictDao.xml

@@ -15,7 +15,7 @@
 
 
 	<select id="list" resultType="map">
 	<select id="list" resultType="map">
 		select * from dict
 		select * from dict
-		where num = 0
+		where pid = 0
 		<if test="condition != null and condition != ''">
 		<if test="condition != null and condition != ''">
 			AND name like CONCAT('%',#{condition},'%')
 			AND name like CONCAT('%',#{condition},'%')
 		</if>
 		</if>

src/main/webapp/static/modular/system/user/user.js

@@ -98,8 +98,10 @@ MgrUser.roleAssign = function () {
  */
  */
 MgrUser.delMgrUser = function () {
 MgrUser.delMgrUser = function () {
     if (this.check()) {
     if (this.check()) {
-        var userId = this.seItem.id;
-        var ajax = new $ax(Feng.ctxPath + "/mgr/delete", function (data) {
+
+        var operation = function(){
+            var userId = MgrUser.seItem.id;
+            var ajax = new $ax(Feng.ctxPath + "/mgr/delete", function () {
                 Feng.success("删除成功!");
                 Feng.success("删除成功!");
                 MgrUser.table.refresh();
                 MgrUser.table.refresh();
             }, function (data) {
             }, function (data) {
@@ -107,6 +109,9 @@ MgrUser.delMgrUser = function () {
             });
             });
             ajax.set("userId", userId);
             ajax.set("userId", userId);
             ajax.start();
             ajax.start();
+        };
+
+        Feng.confirm("是否删除用户" + MgrUser.seItem.account + "?",operation);
     }
     }
 };
 };