diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index 509381b..d03a2eb 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -127,7 +127,8 @@ public class AdminGoodsController extends BaseController {
 
         Map gdmap = goodsService.getGoodsDetail(islicode);
         // 授权方信息
-        Map userMap = userService.getApiUser(gdmap.get("user_isli").toString(),token);
+        String userIsli = (String)gdmap.get("user_isli");
+        Map userMap = userService.getApiUser(userIsli,token);
         gdmap.put("userinfo",userMap);
 
         jsonObject.put("code",200);
@@ -150,4 +151,14 @@ public class AdminGoodsController extends BaseController {
         jsonObject.put("msg","成功");
         return jsonObject;
     }
+
+    /**
+     * 商品来源详情
+     * @param jstr vue端发送来的json字符串
+     * @return
+     */
+    @PostMapping("/sourceDetail")
+    public JSONObject sourceDetail(@RequestBody String jstr){
+        return jsonObject;
+    }
 }
diff --git a/src/main/java/cn/chjyj/szwh/mapper/AdminMapper.java b/src/main/java/cn/chjyj/szwh/mapper/AdminMapper.java
index 8f3b822..b6a5df7 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/AdminMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/AdminMapper.java
@@ -26,6 +26,12 @@ public interface AdminMapper {
      */
     List<Admin> getAdminList(@Param("startRs") int startRs, @Param("pageSize") int pagesize);
 
+    /**
+     * 查询所有的管理员
+     * @return
+     */
+    List<Admin> getAllAdminList();
+
     /**
      * 增加管理员
      * @param admin
diff --git a/src/main/java/cn/chjyj/szwh/service/AdminService.java b/src/main/java/cn/chjyj/szwh/service/AdminService.java
index 57b7e83..00ff4f7 100644
--- a/src/main/java/cn/chjyj/szwh/service/AdminService.java
+++ b/src/main/java/cn/chjyj/szwh/service/AdminService.java
@@ -21,6 +21,12 @@ public interface AdminService {
      */
     List<Admin> getAdminList(int page);
 
+    /**
+     * 罗列所有d管理员
+     * @return
+     */
+    List<Admin> getAllAdmin();
+
     /**
      * 增加管理员
      * @param admin
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AdminServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AdminServiceImpl.java
index bcb96da..aa51573 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/AdminServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/AdminServiceImpl.java
@@ -28,6 +28,11 @@ public class AdminServiceImpl implements AdminService {
         return adminMapper.getAdminList(startrs,ChConstant.PAGESIZE);
     }
 
+    @Override
+    public List<Admin> getAllAdmin() {
+        return adminMapper.getAllAdminList();
+    }
+
     @Override
     public int addAdmin(Admin admin) {
         return adminMapper.addAdmin(admin);
diff --git a/src/main/resources/mapper/szwh/AdminMapper.xml b/src/main/resources/mapper/szwh/AdminMapper.xml
index 87b05a7..250d0e5 100644
--- a/src/main/resources/mapper/szwh/AdminMapper.xml
+++ b/src/main/resources/mapper/szwh/AdminMapper.xml
@@ -17,6 +17,13 @@
         )SELECT * FROM mm ORDER BY id DESC;
     </select>
 
+
+    <!--    所有的管理员-->
+    <select id="getAllAdminList" resultType="cn.chjyj.szwh.bean.Admin">
+        select <include refid="column"/>
+        from <include refid="tbName"/>
+    </select>
+
     <!-- 主键查询用户信息 -->
     <select id="getAdminById" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.Admin">
         select <include refid="column"/>