tx-lims-after.git

			@@ -98,6 +98,16 @@
			UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
			return Result.success(userService.selectUserList(page, user));
			}

			@ValueClassify("人员总览")
			@ApiOperation(value = "人员总览")
			@PostMapping("/selectPersonnelOverview")
			public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
			Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
			UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
			return Result.success(userService.selectPersonnelOverview(page, user));
			}

			@ValueClassify("用户管理")
			@ApiOperation(value = "修改用户信息")
			@PostMapping("/updateUser")
			@@ -171,4 +181,19 @@
			public Result<?> upUserPassword(String oldPassword, String newPassWord){
			return Result.success(userService.upUserPassword(oldPassword, newPassWord));
			}

			@ValueClassify("人员明细")
			@PostMapping("/upUserDepardLimsId")
			@ApiOperation(value = "修改人员明细所在组织架构")
			public Result<?> upUserDepardLimsId(String ids, String id){
			return Result.success(userService.upUserDepardLimsId(ids, id));
			}

			@ValueClassify("人员明细")
			@PostMapping("/delUserDepardLimsId")
			@ApiOperation(value = "删除人员明细所在组织架构")
			public Result<?> delUserDepardLimsId(Integer id){
			return Result.success(userService.delUserDepardLimsId(id));
			}

			}