diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 141d9d64ebc2cf7ea484e79f8e5d332449263053..05e73c822ebc38f2b5bea8db57198077e4ba1880 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -10,8 +10,6 @@
 package com.cetc32.dh.common.response;
 
 import com.cetc32.dh.entity.NumberS;
-import com.cetc32.dh.entity.SysInfo;
-import com.cetc32.dh.entity.pritrace;
 
 import java.util.List;
 
@@ -30,11 +28,6 @@ public class PageDataResult extends ResponseMessage{
 
     private List<? extends NumberS> list;
 
-    public PageDataResult(Integer count, List<pritrace> pritraces, Integer offset) {
-        super();
-    }
-
-
     public List<?> getList_new() {
         return list_new;
     }
@@ -94,6 +87,7 @@ public class PageDataResult extends ResponseMessage{
         this.list = list;
     }
 
+
     /**
      * 指定缓存失效时间
      * @return
diff --git a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java
index 98cebe8861d2b1c03ca3063bd0ec88844e4bd25d..fd7269cf1e7c1e67eca60abb1f9e63d8b21bf43c 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java
@@ -1,26 +1,44 @@
 package com.cetc32.dh.controller.rest;
 
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.dto.pritraceDTO;
-import com.cetc32.dh.entity.pritrace;
+import com.cetc32.dh.common.response.ResponseData;
+import com.cetc32.dh.entity.BaseAdminUser;
+import com.cetc32.dh.entity.PriTrace;
+import com.cetc32.dh.service.AdminUserService;
 import com.cetc32.dh.service.PritraceService;
 import com.cetc32.webutil.common.annotations.LoginRequired;
+import com.cetc32.webutil.common.bean.LoginUser;
+import com.cetc32.webutil.common.util.SecurityUserUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @LoginRequired
 @RestController
-@RequestMapping("/pritrace")
+@RequestMapping("/rest/pri/trace")
 public class PritraceController {
     @Autowired
     PritraceService pritraceService;
 
-    @PostMapping("/findbyuser")
-    public PageDataResult findByUser(@RequestBody pritraceDTO pritraceDTO){
-        List<pritrace> pritraces = pritraceService.selectByUser(pritraceDTO.getUser());
-        Integer count = pritraceService.selectByUser(pritraceDTO.getUser()).size();
-        return new PageDataResult(count,pritraces);
+    @Autowired
+    AdminUserService adminUserService;
+
+    @GetMapping("/user")
+    public ResponseData findByUser(String user){
+        if(StringUtils.isBlank(user))
+            return ResponseData.error();
+        List<Integer> pritraces = pritraceService.selectByUser(user);
+        return ResponseData.success(pritraces);
+    }
+    @GetMapping("/curuser")
+    public ResponseData pritraceCurUser(@Nullable Integer deviceType){
+        LoginUser lu=SecurityUserUtil.getUser();
+        if(null == lu || StringUtils.isBlank(lu.getUsername()))
+            return  ResponseData.error();
+        List<Integer> pritraces = pritraceService.selectByUser(lu.getUsername());
+        List<BaseAdminUser>users =adminUserService.selectUserByDepartmentId(pritraces);
+        return ResponseData.success(users);
     }
 }
diff --git a/src/main/java/com/cetc32/dh/dto/pritraceDTO.java b/src/main/java/com/cetc32/dh/dto/PriTraceDTO.java
similarity index 83%
rename from src/main/java/com/cetc32/dh/dto/pritraceDTO.java
rename to src/main/java/com/cetc32/dh/dto/PriTraceDTO.java
index d47e03051d0b135bb86df4212fe51b9d815f2a1f..de371713b644b0d40e2bf9413f5dcc55329a28af 100644
--- a/src/main/java/com/cetc32/dh/dto/pritraceDTO.java
+++ b/src/main/java/com/cetc32/dh/dto/PriTraceDTO.java
@@ -2,7 +2,7 @@ package com.cetc32.dh.dto;
 
 import com.cetc32.dh.entity.NumberS;
 
-public class pritraceDTO extends NumberS {
+public class PriTraceDTO extends NumberS {
     private String user;
 
     public String getUser() {
diff --git a/src/main/java/com/cetc32/dh/entity/pritrace.java b/src/main/java/com/cetc32/dh/entity/PriTrace.java
similarity index 90%
rename from src/main/java/com/cetc32/dh/entity/pritrace.java
rename to src/main/java/com/cetc32/dh/entity/PriTrace.java
index 8f22271b6762cf6e9dbf3a2edc48fcb64eb0ebda..dcf97a321de350e9d84e1814801ddb7a668cafb7 100644
--- a/src/main/java/com/cetc32/dh/entity/pritrace.java
+++ b/src/main/java/com/cetc32/dh/entity/PriTrace.java
@@ -1,6 +1,6 @@
 package com.cetc32.dh.entity;
 
-public class pritrace extends NumberS {
+public class PriTrace extends NumberS {
     private String user;
 
     private Integer departid;
diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
index 3101dacac1c3deaf6e201390a7402cb5a3a8f3c4..c3120977be95a028f66b4ea42fde2fce41035933 100644
--- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
@@ -70,4 +70,6 @@ public interface BaseAdminUserMapper extends MyMapper<BaseAdminUser> {
     Integer countActiveUserBetween(@Param("startTime") Date startTime,@Param("endTime") Date endTime);
 
     List<String> getZQPoints(List<String> idList);
+
+    List<BaseAdminUser >selectUserByDepartmentId(@Param("list")List<Integer> list);
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java
index 28c0f7b41494ad7684098018d3891f84e675b3fe..424b86ada20f6ffcb2a3cc9034777999a2d7ebde 100644
--- a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java
@@ -1,13 +1,13 @@
 package com.cetc32.dh.mybatis;
 
-import com.cetc32.dh.entity.pritrace;
+import com.cetc32.dh.entity.PriTrace;
 import org.springframework.stereotype.Repository;
 import tk.mapper.MyMapper;
 
 import java.util.List;
 
 @Repository
-public interface pritraceMapper extends MyMapper<pritrace> {
+public interface pritraceMapper extends MyMapper<PriTrace> {
 
-    List<pritrace> selectByUser(String user);
+    List<Integer> selectByUser(String user);
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java
index 46259c85b1638f48d88aee7587675d9da91334e1..acd07b6454a248456728c62eb02b776a459ed009 100644
--- a/src/main/java/com/cetc32/dh/service/AdminUserService.java
+++ b/src/main/java/com/cetc32/dh/service/AdminUserService.java
@@ -62,4 +62,6 @@ public interface AdminUserService {
     Integer getAppLoginUser();
 
     List<String> getZQPoints(List<String> idList);
+
+    List<BaseAdminUser> selectUserByDepartmentId(List<Integer>ids);
 }
diff --git a/src/main/java/com/cetc32/dh/service/PritraceService.java b/src/main/java/com/cetc32/dh/service/PritraceService.java
index ec2425b0aa285a44a9d85c334c07973a1d2196a2..8e1916e40c3edeeac0e20191c50c676baa7c1656 100644
--- a/src/main/java/com/cetc32/dh/service/PritraceService.java
+++ b/src/main/java/com/cetc32/dh/service/PritraceService.java
@@ -1,9 +1,9 @@
 package com.cetc32.dh.service;
 
-import com.cetc32.dh.entity.pritrace;
+import com.cetc32.dh.entity.PriTrace;
 
 import java.util.List;
 
 public interface PritraceService {
-    List<pritrace> selectByUser(String user);
+    List<Integer> selectByUser(String user);
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
index 145e395cdac1d25f78895da9c3a8c56bbf2c04cb..e2a91c0b3e8fa6f3e415d692ca1b953acae4c706 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
@@ -326,5 +326,12 @@ public class AdminUserServiceImpl implements AdminUserService {
     {
         return baseAdminUserMapper.getZQPoints(idList);
     }
+
+    @Override
+    public List<BaseAdminUser> selectUserByDepartmentId(List<Integer> ids) {
+        if(ids ==null || ids.size()<=0)
+         return null;
+        return baseAdminUserMapper.selectUserByDepartmentId(ids);
+    }
 }
 
diff --git a/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java
index e10048b924c276104a68ea69693c10b0f13a7853..37a3b9bc4e3df10cb119c15e54e0e42b3d2a9502 100644
--- a/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java
@@ -1,6 +1,6 @@
 package com.cetc32.dh.service.impl;
 
-import com.cetc32.dh.entity.pritrace;
+import com.cetc32.dh.entity.PriTrace;
 import com.cetc32.dh.mybatis.pritraceMapper;
 import com.cetc32.dh.service.PritraceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ public class PritraceServiceImpl implements PritraceService {
     pritraceMapper pritraceMapper;
 
     @Override
-    public List<pritrace> selectByUser(String user){
+    public List<Integer> selectByUser(String user){
         return pritraceMapper.selectByUser(user);
     }
 
diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml
index 7212cb65198bf8b5bac451afa05cf5b40863bcac..65286da8794c9794ac07657f01446ba9552c0c54 100644
--- a/src/main/resources/mapper/BaseAdminUserMapper.xml
+++ b/src/main/resources/mapper/BaseAdminUserMapper.xml
@@ -370,7 +370,12 @@
     select sum(web_login_count)
     from base_admin_user
   </select>
-
+  <select id="selectUserByDepartmentId" resultMap="BaseResultMap">
+    SELECT * from base_admin_user where department in
+    <foreach collection="list" item="id" open="(" separator="," close=")">
+      #{id}
+    </foreach>
+  </select>
   <select id="getAppLoginCount" resultType="java.lang.Integer">
     select sum(app_login_count)
     from base_admin_user
diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml
index 5199985403478e17589d602fa3957ba55b11850f..6de1aa6bd0e15b2f570539b50978f3619278a0b0 100644
--- a/src/main/resources/mapper/pritraceMapper.xml
+++ b/src/main/resources/mapper/pritraceMapper.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cetc32.dh.mybatis.pritraceMapper" >
-  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.pritrace" >
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.PriTrace" >
     <result column="username" property="user" jdbcType="VARCHAR" />
     <result column="departid" property="departid" jdbcType="INTEGER" />
   </resultMap>
 
-  <select id="selectByUser" resultMap="BaseResultMap">
+  <select id="selectByUser" resultType="java.lang.Integer">
     select departid
     from pritrace
     where username = #{user}