用户及权限bug

VisualInspection/js/role/addpermision.js

@@ -40,7 +40,7 @@ function loadPermisionData(nodedata) {
     });
 
 
-
+    $("#permision_add_btn").off("click");
     $("#permision_add_btn").on("click", function () {
         addpermision();
     })

VisualInspection/js/role/addrole.js

@@ -12,6 +12,7 @@ function loadRoleData(role) {
        
     }
 
+    $("#role_add_btn").off("click");
     $("#role_add_btn").on("click", function () {
         addrole();
     })

VisualInspection/js/role/addrolepermision.js

@@ -13,6 +13,7 @@ function loadPermisionRoleData(nodedata, roleid) {
     getRole();
 
 
+    $("#role_add_btn").off("click"); 
     $("#role_add_btn").on("click", function () {
 
         addroleper();

VisualInspection/js/role/permision.js

@@ -232,21 +232,24 @@ function addobj(data) {
 function updateRole(permisionid) {
 
     RoleGetByPermision(permisionid, function (data) {
+        
         //跟新table
         var rowdata = [];
         if (data != null && data.length > 0) {
             for (var i = 0; i < data.length; i++) {
                 var role = data[i];
-
+ 
                 RoleMap.set(role.id, role)
                 var roledata = {};
                 roledata["checked"] = false;
-                roledata["data"] = [i + 1, role.des, role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                roledata["data"] = [i + 1,  typeof(role.des)=="undefined"?"":role.des, typeof(role.mod)=="undefined"?1:role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
                 rowdata.push(roledata);
 
                 RoleMap.set(role.id,role);
             }
         }
+         console.log(cols)
+
         // 使用data参数更新数据：
         $('.datatable').datatable('load', {
             cols: cols,

VisualInspection/js/user/addUser.js

@@ -38,6 +38,7 @@ function loadUserData(nodedata) {
         selectvalue: pnode.length > 0 ? pnode[0].id : null
     });
 
+    $("#user_add_btn").off("click");
     $("#user_add_btn").on("click", function () {
         addUser();
     })
@@ -56,8 +57,8 @@ function resetform() {
     $("#user_idno").val("")
     $("#user_email").val("")
 
-    $("#user_img_add").addClass("hide");
-    $("#user_img_pre").removeClass("hide");
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
 
 }
 
@@ -127,14 +128,11 @@ function initUserInfo() {
 
 function addUser() {
 
-
-
     var username = $("#user_name").val();
     var userworkno = $("#user_workno").val();
     var userpassword = $("#user_password").val();
     var userconfirmpassword = $("#user_confirm_password").val();
     var userpic = $("#user_pic").attr("path");
-    // var userroleselect = $("#user_role_select").val();
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
@@ -155,6 +153,7 @@ function addUser() {
         "roleids": userroles
     }
 
+alert(userroles)
     if (userpassword != null && typeof (userpassword) != "undefined") {
         parm["password"] = userpassword;
     }

VisualInspection/view/role/addrolepermision.html

@@ -21,7 +21,7 @@
          <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">权限：</label>
             <div class="col-md-6 col-sm-10">
-                <input type="text" id="permission_mod" class="form-control" id="code_flag" placeholder="1-读写 2-读 3-删除 ">
+                <input type="text" id="permission_mod" class="form-control" id="code_flag" placeholder="1-读写 2-读 3-删除 " value="1"/>
             </div>
         </div>
     </form>

VisualInspection/view/user/addUser.html

@@ -48,7 +48,7 @@
 
 
             </div>
-            <div class="col-md-4" style="width:160px">
+            <div class="col-md-4" style="width:240px;height:200px;">
                 <div class="row hide" id="user_img_pre">
                     <section class='up-section fl loading' id="user_img_pre2">
                     </section>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -76,6 +76,7 @@
         FROM t_sys_users t LEFT JOIN t_br_layer_fee_station fs ON t.organid = fs.organ_id
         where 1=1 and t.status>0 
         <if test="organid != null and organid != 0">and t.organid = #{organid} </if>
+         <if test="username != null">and t.username = #{username} </if>
         <if test="positionid != null and positionid != 0">and t.positionid = #{positionid} </if>
         <if test="classid != null and classid != 0">and t.classid = #{classid} </if>
         <if test="teamid != null and teamid != 0">and t.teamid = #{teamid} </if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/PermissionServiceImpl.java

@@ -86,6 +86,9 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 
 	@Override
 	public void addrolepermision(RolePermision rolePermision) {
+		if(rolePermision.getPermission_type() == null){
+			rolePermision.setPermission_type(1);
+		}
 		permissionDao.addrolepermision(rolePermision);
 	}
 

VisualInspection_server/src/main/resources/application.properties

@@ -2,8 +2,8 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://192.168.8.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -11,8 +11,8 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -53,11 +53,11 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-#spring.redis.host=10.112.0.199
-spring.redis.host=git.topm.win
+spring.redis.host=10.112.0.199
+#spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6380
-#spring.redis.port=6379 
+#spring.redis.port=6380
+spring.redis.port=6379 
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09