Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/.vscode/settings.json

@@ -0,0 +1,3 @@
+// 将设置放入此文件中以覆盖默认值和用户设置。
+{
+}

VisualInspection/js/role/permision.js

@@ -0,0 +1,118 @@
+$(document).ready(function () {
+
+    $("#main_content_title").html("权限管理")
+
+
+
+    
+     $('#dashboard').dashboard({ draggable: true });
+     var zTreeObj;
+     var zNodes = [];
+     dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
+
+     getPermission()
+
+});
+
+
+
+function getPermission() {
+     function zTreeOnRename(event, treeId, treeNode, isCancel) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
+
+     //  function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+     //      return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+     //  };
+
+     function zTreeOnRemove(event, treeId, treeNode) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
+
+     function zTreeOnClick(event, treeId, treeNode) {
+         updateUser(treeNode.id)
+     };
+
+
+     var setting = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: false, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+             onRename: zTreeOnRename,
+             //  beforeDrop: zTreeBeforeDrop,
+             onRemove: zTreeOnRemove,
+             onClick: zTreeOnClick
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };
+
+     PermisionGetAll(function(data) {
+         console.log(data)
+         zdata = [];
+         for (var i = 0; i < data.length; i++) {
+             var m = data[i];
+             var zdataItem = {};
+             zdataItem["id"] = m.id;
+             zdataItem["value"] = m.id;
+             zdataItem["pId"] = null;
+             zdataItem["name"] = m.name;
+             zdataItem["open"] = true;
+             zdataItem["children"] = addobj(m);
+             zdata.push(zdataItem);
+         }
+         dept_tree = $.fn.zTree.init($("#permision_tree"), setting, zdata)
+     }, function(error) {
+
+     });
+ }
+
+
+
+ function addobj(data) {
+     var zdata = [];
+     if (typeof(data.childs) != "undefined" && data.childs != null &&
+         data.childs.length > 0) {
+         for (var i = 0; i < data.childs.length; i++) {
+             var m = data.childs[i];
+             var zdataItem = {};
+             zdataItem["id"] = m.id;
+             zdataItem["value"] = m.id;
+             zdataItem["pId"] = data.id;
+             zdataItem["icon"] = "";
+             zdataItem["open"] = true;
+             zdataItem["name"] = m.name;
+             zdataItem["children"] = addobj(m);
+             zdata.push(zdataItem);
+         }
+         return zdata;
+     } else {
+         return [];
+     }
+ }

VisualInspection/js/teamClass/check_team_schedule.js

@@ -3,8 +3,10 @@
 
          $("#main_content_title").html("稽查人员排班")
 
+        var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+        // console.log(user );
         // 用户的dept_id
-        var user_dept_id = '' ;
+        var user_dept_id = user.organid ;
         
         // 稽查小组type
         var team_type = 2 ;
@@ -12,8 +14,7 @@
         // 日期游标
         var date_cursor = 0 ;
 
-        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
-        // console.log(user );
+
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -107,7 +108,7 @@
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
             $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
-
+             $("#team_detail").html("");
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
@@ -124,6 +125,7 @@
                     for(var i=0;i<data.length;i++){
                         $(".class_team_"+data[i].class_type).val(data[i].team_id);
                     }
+                    $("#team_detail").html(data[0].user_ids_name);
                 }else{
                      $("#save_term_class").data("modify_flag",0);
                 }
@@ -179,7 +181,8 @@
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
                         "start_time": $("#save_term_class").data("date")+" 00:00:00",
                         "end_time": $("#save_term_class").data("date")+" 00:00:00",
-                        "dept_id":user_dept_id
+                        "dept_id": user_dept_id,
+                        "user_ids":  $("#team_detail").data("user_ids")      
                     };
                     data.push(obj);
                 }
@@ -227,6 +230,19 @@
 
    })
 
+   $("#all_term").change(function(){
+       if($(this).val() !="" ){
+           // 请求班组下人员信息
+           var data ={ "id": $(this).val() };
+           post_common_service( "team/getDetailById",data,function(data){
+                $("#team_detail").html(data.user_ids_name); 
+                $("#team_detail").data("user_ids",data.user_ids);            
+           },function(error){})
+       }else{
+            $("#team_detail").html("");   
+       }
+   })
+
    // 根据class_type 获取班次名称
    function getTeamName(class_type){
        if(class_type == 1){

VisualInspection/js/user/addUser.js

@@ -50,7 +50,7 @@ function resetform() {
     $("#user_workno").val("");
     $("#user_password").val("");
     $("#user_confirm_password").val("")
-    $("#user_birth").val("")
+    // $("#user_birth").val("")
     $("#user_mobile").val("")
     $("#user_position").val("")
     $("#user_idno").val("")
@@ -68,7 +68,7 @@ function initUserInfo() {
     $("#user_workno").val(usertemp.workno);
     $("#user_password").val(usertemp.password);
     $("#user_confirm_password").val(usertemp.password)
-    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    // $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
     $("#user_mobile").val(usertemp.mobile)
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
@@ -92,7 +92,7 @@ function initUserInfo() {
         });
         $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
         var $img = $("<img class='up-img up-opcity' id='user_pic'>");
-        $img.attr("src", base_server_url + usertemp.pic);
+        $img.attr("src", usertemp.pic);
         $img.appendTo($section);
         var $p = $("<p class='img-name-p'>");
         $p.html("image").appendTo($section);
@@ -134,7 +134,7 @@ function addUser() {
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
-    var userbirth = $("#user_birth").val();
+    // var userbirth = $("#user_birth").val();
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();

VisualInspection/js/util/const.js

@@ -20,6 +20,10 @@ var DEPT_ADD = "dept/addDept"
 var DEPT_EDIT = "dept/updateDept/"
 var DEPT_DELETE = "/dept/deleteDept/"
 
+
+// 角色
+var PERMISION_GET_ALL = "/permission/get/all"
+
 //角色
 var ROLE_GET_ALL = "/role/get/all/"
 var ROLE_GET_ALL_DATA = "/role/get/alldata/"

VisualInspection/js/util/service.js

@@ -103,6 +103,23 @@ function MenuGetAll(success, fail) {
     });
 }
 
+function PermisionGetAll(success, fail) {
+    var url = base_server_url + PERMISION_GET_ALL
+    ajaxGet(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
+
+
 function DeptGetAll(success, fail) {
     var url = base_server_url + DEPT_GET_ALL
     ajaxGet(url, "", function(response) {

VisualInspection/view/role/permision.html

@@ -0,0 +1,42 @@
+<link rel="stylesheet" type="text/css" href="/css/role/permision.css?__inline">
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
+<script type="text/javascript" src="/js/role/permision.js?__inline"></script>
+<div class="container-fluid ">
+    <div id="dashboard" class="dashboard dashboard-draggable" data-height="500">
+        <div class="row">
+            <div class="col-md-3">
+                <div class="panel" data-id="1">
+                    <div class="panel-heading">
+                        <span class="title">权限列表</span>
+                        <div class="panel-actions">
+                            <button type="button" class="btn" id="permision_add" data-position="center" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
+                            <button type="button" class="btn" id="permision_edit" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
+                            <button type="button" class="btn" id="permision_delete" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
+                        </div>
+                    </div>
+                    <div class="panel-body">
+                        <ul id="permision_tree" class="ztree">
+
+                        </ul>
+                    </div>
+                </div>
+
+            </div>
+            <div class="col-md-9">
+                <div class="panel" data-id="3">
+                    <div class="panel-heading">
+                        <span class="title">角色列表</span>
+                        <div class="panel-actions">
+                            <button type="button" class="btn" id="role_add" data-toggle="tooltip" title="添加角色"><i class="icon-plus"></i></button>
+                        </div>
+                    </div>
+                    <div class="panel-body no-padding" style="padding:0">
+                        <div class="datatable" data-checkable="true" data-sortable="true"></div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -23,36 +23,18 @@
             <!-- 添加对话框 -->
             <div class="container-fluid ">
                 <div class="form-horizontal">
-                    <!--<div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="mooring_term" type="text" class="form-control class_team_1" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select id="middle_term" type="text" class="form-control class_team_2" >
+                            <select id="all_term" type="text" class="form-control class_team_4" >
                                 <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="night_term" type="text" class="form-control class_team_3" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>-->
-                    <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">人员详情</label>
                         <div class="col-md-6 col-sm-8">
-                            <select id="all_term" type="text" class="form-control class_team_4" >
-                                <option value=''>请选择班组</option>
-                            </select>
+                            <div class="form-control class_team_4" id="team_detail" style="height:auto;min-height:32px;"></div>
                         </div>
                     </div>
                     <hr>

VisualInspection/view/user/addUser.html

@@ -68,12 +68,12 @@
 
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">生日：</label>
             <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_birth" class="form-control" placeholder="生日">
             </div>
-        </div>
+        </div>-->
 
 
         <div class="form-group">

VisualInspection_server/src/main/java/com/xintong/VideocheckApplication.java

@@ -1,5 +1,6 @@
 package com.xintong;
 
+import org.apache.ibatis.logging.LogFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -21,6 +22,7 @@ public class VideocheckApplication {
 		ParserConfig.getGlobalInstance().addAccept("com.xintong.");
 		ParserConfig.getGlobalInstance().addAccept("org.springframework.security.core.");
 
+		LogFactory.useLog4JLogging();
         SpringApplication.run(VideocheckApplication.class, args);
 	}
 }

VisualInspection_server/src/main/java/com/xintong/system/securityTools/WebSecurityConfig.java

@@ -66,7 +66,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                  "/**/*.js"
          ).permitAll()
          // 对于获取token的rest api要允许匿名访问
-         .antMatchers("/user/auth/**","/file/**").permitAll()
+         .antMatchers("/user/auth/**","/file/**","/druid/**").permitAll()
          // 除上面外的所有请求全部需要鉴权认证
          .anyRequest().authenticated();
     	

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Permission.java

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.bean;
 
+import java.util.List;
+
 import lombok.Data;
 
 /**
@@ -7,20 +9,21 @@ import lombok.Data;
  */
 @Data
 public class Permission {
-	private int id;
+	private Integer id;
 	// 权限名称
 	private String name;
 	// 权限描述
-	private String descritpion;
+	private String description;
 	// 父节点id
-	private int pid;
+	private Integer pid;
 	// 资源id
-	private int resourceid;
+	private Integer resourceid;
 	// 类型 1-菜单
-	private int type;
+	private Integer type;
 	// 0 正常 -1 删除
-	private int status;
+	private Integer status;
 	//1-读写 2-读 3-删除 
-	private int permission_type;
+	private Integer permission_type;
 
+	private List<Permission> childs;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/TeamClass.java

@@ -39,6 +39,7 @@ public class TeamClass {
     private Long team_id;
     //人员ids
     private String user_ids;
+    private String user_ids_name ;
     //部门id
     private Long dept_id;
     //班次类型（早、中、晚、全天）

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/PermissionController.java

@@ -93,14 +93,12 @@ public class PermissionController extends BaseController {
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllPermission(@PathVariable Integer page,@PathVariable Integer size ){
-        try{
-        	PageHelper.startPage(page, size); 
+    @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAllPermission(){
+        try{ 
         	List<Permission> permissions= permissionService.getPermissions(new  Permission());
         	
-        	return returnResult(0, "获取成功", new PageInfo(permissions));
+        	return returnResult(0, "获取成功", permissions);
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/RoleController.java

@@ -31,6 +31,7 @@ public class RoleController extends BaseController {
 
 	@Autowired
 	private RoleService roleService;
+	
 
 	/**
 	 * 添加角色
@@ -112,6 +113,8 @@ public class RoleController extends BaseController {
 		try {
 			PageHelper.startPage(page, size);
 			List<RoleData> roles = roleService.getRoleDatas(new Role());
+			
+			
 
 			return returnResult(0, "获取成功", new PageInfo(roles));
 		} catch (Exception e) {

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamController.java

@@ -87,6 +87,20 @@ public class TeamController extends BaseController {
     }
     
     /**
+     * 根据team_id 获取班组详情
+     * @param team
+     * @return
+     */
+    @RequestMapping(value = "/getDetailById")
+    public String getTeamPersonsById(@RequestBody Team team){
+    	if(team.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	Team t = teamService.getDetailsById(team);
+    	return super.returnSuccessResult(t);
+    }
+    
+    /**
      * 通过部门id获取班组
      * @return
      * String

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -17,6 +17,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.system.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.bean.Role;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.RoleService;
@@ -110,6 +111,7 @@ public class UserController extends BaseController {
         		user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
         	}
         	if(user.getRoleids()!=null){
+        		roleService.roleUnBindUser(user.getId());
         		for(String id:user.getRoleids()){
         			roleService.roleBindUser(Integer.parseInt(id), user.getId());
         		}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/RoleDao.java

@@ -31,4 +31,6 @@ public interface RoleDao  {
     
     public List<RoleData> getRolesCount(Role role);
     
+    public void roleUnBindUser(Integer userId);
+    
 }

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

@@ -45,7 +45,13 @@
         SET
         <if test="username != null">username = #{username},</if>
         <if test="age != null">age = #{age},</if>
+        <if test="organid != null">ORGANID = #{organid},</if>
         <if test="password != null">password = #{password},</if>
+        <if test="truename != null">TRUENAME = #{truename},</if>
+        <if test="workno != null">workno = #{workno},</if>
+        <if test="mobile != null">mobile = #{mobile},</if>
+        <if test="idno != null">idno = #{idno},</if>
+        <if test="positionid != null">positionid = #{positionid},</if>
         <if test="pic != null">pic = #{pic},</if>
         id = #{id}
         WHERE

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/PermissionDaoMapper.xml

@@ -5,7 +5,7 @@
   <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Permission" >
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
-        <result column="descritpion" property="descritpion" jdbcType="VARCHAR" />
+        <result column="description" property="description" jdbcType="VARCHAR" />
         <result column="pid" property="pid" jdbcType="INTEGER" />
         <result column="type" property="type" jdbcType="INTEGER" />     
         <result column="resourceid" property="resourceid" jdbcType="INTEGER" />  
@@ -22,12 +22,12 @@
     
      <select id="getPermission" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" resultMap="BaseResultMap">
         SELECT 
-        id,name,descritpion,pid,type,resourceid,status 
+        id,name,description,pid,type,resourceid,status 
          FROM sys_permission
          where 1=1
          <if test="id != null and id != 0">and id = #{id}</if>
          <if test="name != null">and name = #{name}</if>
-         <if test="descritpion != null">and descritpion = #{descritpion}</if>
+         <if test="description != null">and description = #{description}</if>
          <if test="pid != null and pid != 0">and pid = #{pid}</if>
          <if test="type != null and type != 0">and type = #{type}</if>
          <if test="resourceid != null and resourceid != 0">and resourceid = #{resourceid}</if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/RoleMapper.xml

@@ -59,7 +59,9 @@
         id =#{id}
     </delete>
     
-    
+    <delete id="roleUnBindUser" parameterType="java.lang.Integer" >
+        delete from sys_role_user where sys_user_id = #{userId,jdbcType=INTEGER}
+    </delete>
     
     
     <insert id="roleBindPermission" parameterType="java.util.Map">

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TeamClassMapper.xml

@@ -25,7 +25,7 @@
     </select>
     
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
-        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,st.user_ids ,st.name as team_name,st.type
+        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,t.user_ids ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id
         WHERE 1=1
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/UserMapper.xml

@@ -42,6 +42,7 @@
         sys_user
         SET
         <if test="username != null">userName = #{username},</if>
+        <if test="organid != null and organid != 0">ORGANID = #{organid},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
         id = #{id}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/RoleService.java

@@ -32,4 +32,6 @@ public interface RoleService {
 
 	public List<Role> getRoleByPosition(Integer positionId);
 	public List<RoleData> getRoleDatas(Role role);
+	
+	public void roleUnBindUser(Integer userId);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamService.java

@@ -26,4 +26,5 @@ public interface TeamService {
     public void update(Team team);
     public void delete(Long id);
     public List<Team> getTeamByName(Team team);
+    public Team getDetailsById(Team team);
 }

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

@@ -1,10 +1,15 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.service.BaseService;
@@ -22,11 +27,39 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(PermissionService.class);
 
+    @Autowired
     private PermissionDao permissionDao;
 
 	@Override
 	public List<Permission> getPermissions(Permission permission) {
-		return permissionDao.getPermission(permission);
+		
+		List<Permission> permisions = permissionDao.getPermission(permission);
+		List<Permission> olist = new ArrayList<>();
+		Map<Integer, List<Permission>> map = new HashMap<>();
+		// 找出所有父
+		for (Permission o : permisions) {
+			if (o.getPid() != null && o.getPid()!=0) {
+				List<Permission> organList = map.get(o.getPid());
+				if (organList == null) {
+					organList = new ArrayList<>();
+				}
+				organList.add(o);
+				map.put(o.getPid(), organList);
+			}
+		}
+		// 找出子
+		for (Integer oid : map.keySet()) {
+			for (Permission m2 : permisions) {
+				if (m2.getId() == oid) {
+					m2.setChilds(map.get(oid));
+					if (m2.getPid() == null || m2.getPid()==0) {
+						olist.add(m2);
+					}
+				}
+			}
+		}
+
+		return olist;
 	}
 
 	@Override

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

@@ -8,7 +8,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
 import com.xintong.visualinspection.pojo.RoleData;
 import com.xintong.visualinspection.service.BaseService;
@@ -26,6 +28,9 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 
     @Autowired
     private RoleDao roleDao;
+    
+    @Autowired
+    private PermissionDao permissionDao;
 
 
 	@Override
@@ -112,5 +117,12 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 		return roleDao.getRolesCount(role);
 	}
 
+
+	@Override
+	public void roleUnBindUser(Integer userId) {
+		roleDao.roleUnBindUser(userId);
+		
+	}
+
     
 }

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

@@ -32,7 +32,21 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 	@Override
 	public List<TeamClass> getClassList(TeamClass teamClass) {
 		// TODO Auto-generated method stub
-		return teamClassDao.getClassList(teamClass);
+		List<TeamClass> list = teamClassDao.getClassList(teamClass);
+		for(TeamClass obj:list){
+			if(obj.getUser_ids()==null)
+				continue;
+			String[] user_ids = obj.getUser_ids().split(",");
+			StringBuffer user_names = new StringBuffer();
+			for(int i=0;i<user_ids.length;i++){
+				User user = CacheUtil.userMap.get(Long.valueOf(user_ids[i]));
+				String userNames = user!=null?user.getTruename():"";
+				user_names.append(userNames);
+				user_names.append(",");
+			}
+			obj.setUser_ids_name(user_names.toString());
+		}
+		return list;
 	}
 
 	@Override

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

@@ -115,4 +115,21 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 		}
 		return teamlist;
 	}
+
+
+	@Override
+	public Team getDetailsById(Team team) {
+		team = teamDao.getOne(team.getId());
+		if(team != null){
+			String[] user_ids = team.getUser_ids().split(",");
+			StringBuffer user_names = new StringBuffer();
+			for(int i=0;i<user_ids.length;i++){
+				String userNames = CacheUtil.userMap.get(Long.valueOf(user_ids[i])).getTruename();
+				user_names.append(userNames!=null?userNames:"" );
+				user_names.append(",");
+			}
+			team.setUser_ids_name(user_names.toString());
+		}
+		return team;
+	}
 }

VisualInspection_server/src/main/resources/application.properties

@@ -72,11 +72,11 @@ spring.redis.timeout=0
 
 
 
-logging.level.root=INFO
+logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=INFO
+logging.level.org.mybites=DEBUG