按部门显示用户

VisualInspection/js/user/userManager.js

@@ -1,6 +1,51 @@
  var zdata = [];
  var dept_tree = null;
  var edittype = "add";
+ var cols = [{
+     width: 10,
+     text: '序号',
+     type: 'number',
+     flex: false,
+     colClass: 'text-center'
+ }, {
+     width: 10,
+     text: 'ID',
+     type: 'number',
+     flex: false,
+     colClass: 'text-center'
+ }, {
+     width: 30,
+     text: '姓名',
+     type: 'string',
+     flex: false,
+     sort: 'down',
+     colClass: 'text-center'
+ }, {
+     width: 40,
+     text: '工号',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 80,
+     text: '手机号',
+     type: 'string',
+     flex: false,
+     sort: 'down',
+     colClass: 'text-center'
+ }, {
+     width: 80,
+     text: '角色',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 160,
+     text: '操作',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }];
  $(document).ready(function() {
 
      $("#main_content_title").html("用户管理")
@@ -60,67 +105,8 @@
          checkable: false,
          sortable: false,
          data: {
-             cols: [{
-                 width: 10,
-                 text: '序号',
-                 type: 'number',
-                 flex: false,
-                 colClass: 'text-center'
-             }, {
-                 width: 30,
-                 text: '姓名',
-                 type: 'string',
-                 flex: false,
-                 sort: 'down',
-                 colClass: 'text-center'
-             }, {
-                 width: 40,
-                 text: '工号',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }, {
-                 width: 80,
-                 text: '手机号',
-                 type: 'string',
-                 flex: false,
-                 sort: 'down',
-                 colClass: 'text-center'
-             }, {
-                 width: 80,
-                 text: '角色',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }, {
-                 width: 160,
-                 text: '操作',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }],
-             rows: [{
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }]
+             cols: cols,
+             rows: []
          }
      });
 
@@ -141,6 +127,54 @@
          alert(treeNode.tId + ", " + treeNode.name);
      }
 
+     function zTreeOnClick(event, treeId, treeNode) {
+
+         var userData = {
+             "organid": treeNode.id
+         }
+
+         UserGetList(userData, function(data) {
+                 console.log(data)
+                     //跟新table
+                 var rowdata = [];
+                 if (data != null && data.length > 0) {
+                     for (var i = 0; i < data.length; i++) {
+                         var user = data[i];
+
+                         var attr = "";
+                         if (user.authorities.length > 0) {
+                             for (var j = 0; j < user.authorities.length; j++) {
+                                 var at = user.authorities[j];
+                                 if (attr.length > 0) {
+                                     attr += "," + at.authority;
+                                     continue;
+                                 }
+                                 attr += at.authority;
+                             }
+                         }
+
+
+                         var userdata = {};
+                         userdata["checked"] = false;
+                         userdata["data"] = [i + 1, user.id, user.username, user.workno == null ? -1 : user.workno, user.mobile, attr, '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>'];
+                         rowdata.push(userdata);
+                     }
+                 }
+
+
+
+                 // 使用data参数更新数据：
+                 $('.datatable').datatable('load', {
+                     cols: cols,
+                     rows: rowdata
+                 });
+
+             },
+             function(error) {
+
+             });
+     };
+
 
      var setting = {
          data: {
@@ -163,7 +197,8 @@
          callback: {
              onRename: zTreeOnRename,
              //  beforeDrop: zTreeBeforeDrop,
-             onRemove: zTreeOnRemove
+             onRemove: zTreeOnRemove,
+             onClick: zTreeOnClick
          },
          edit: {
              enable: true,

VisualInspection/js/util/const.js

@@ -1,7 +1,7 @@
 // 用户
 var USER_LOGIN = "/user/auth/login"
 var USER_LOGOUT = "/user/logout"
-var USER_GET_ALL = "/user/addUser"
+var USER_GET_LIST = "/user/getUserList"
 
 
 var UI_USER_LOGIN = "view/user/login"

VisualInspection/js/util/service.js

@@ -15,6 +15,20 @@ function UserLogin(body, success, fail) {
     });
 }
 
+function UserGetList(data, success, fail) {
+    var url = base_server_url + USER_GET_LIST
+    ajaxPost(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
 
 function MenuGetAll(success, fail) {
     var url = base_server_url + MENU_GET_ALL

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

@@ -22,14 +22,15 @@ public class User implements UserDetails {
 	// 姓名
 	private String truename;
 	// 密码
+	 @JsonIgnore
 	private String password;
 	// 组织机构ID
-	private int organid;
+	private Integer organid;
 	// 班次
-	private int classid;
+	private Integer classid;
 	
 	// 班组
-	private int teamid;
+	private Integer teamid;
 	// 电话号码
 	private String phone;
 	// 状态（-1-删除;1未删除）
@@ -61,13 +62,13 @@ public class User implements UserDetails {
 	// 生日
 	private Date birth;
 	// 年龄
-	private int age;
+	private Integer age;
 	// 职位ID
-	private int positionid;
+	private Integer positionid;
 	// 性别
 	private String sex;
 	// 工号
-	private int workno;
+	private Integer workno;
 	// 身份证号
 	private String idno;
 	
@@ -134,7 +135,7 @@ public class User implements UserDetails {
     }
 
 	// 返回分配给用户的角色列表
-	@JsonIgnore
+	
 	@Override
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 		return authorities;

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

@@ -75,7 +75,6 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
     public String addUser(@RequestBody User user) throws Exception{
     	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
@@ -108,7 +107,6 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
     public String deleteUser(@PathVariable Integer userid){
         try{
@@ -125,8 +123,6 @@ public class UserController extends BaseController {
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
         try{
@@ -139,14 +135,12 @@ public class UserController extends BaseController {
         }
     }
     
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+    @RequestMapping(value = "/getUserList",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@RequestBody User user){
         try{
-        	PageHelper.startPage(page, size); 
         	List<User> users= userService.getUsers(user);
         	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	return returnResult(0, "获取成功", users);
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

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

@@ -17,13 +17,13 @@
 
     <select id="getAll" resultMap="BaseResultMap"  >
         SELECT
-        id,username,password
+        *
         FROM t_sys_users
     </select>
 
     <select id="getOne" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
         SELECT
-        id,username,age,password
+        *
         FROM t_sys_users
         WHERE id = #{id}
     </select>
@@ -67,7 +67,7 @@
     
     <select id="getUsers" parameterType="com.xintong.visualinspection.bean.User" resultMap="BaseResultMap"  >
         SELECT
-        id,username,password
+        *
         FROM t_sys_users
         where 1=1
         <if test="organid != null and organid != 0">and organid = #{organid} </if>

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

@@ -58,7 +58,26 @@ public class UserServiceImpl extends BaseService implements UserService {
     
 	@Override
 	public List<User> getUsers(User user) {
-		return userInfoDao.getUsers(user);
+		//获取权限
+		
+		List<User> users= userInfoDao.getUsers(user);
+		if(users!=null && users.size()>0){
+			for(User u : users){
+				List<Permission> permissions = permissionDao.findByAdminUserId(u.getId());
+	            List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+	            for (Permission permission : permissions) {
+	                if (permission != null && permission.getName() != null) {
+	                    GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(permission.getName());
+	                    grantedAuthorities.add(grantedAuthority);
+	                }
+	            }
+	            u.setGrantedAuthorities(grantedAuthorities);
+			}
+		}
+		return users;
+		
+		
+		
 	}