diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
index 7553c2f..c18be7a 100644
--- a/pages/apply/approval/approval.js
+++ b/pages/apply/approval/approval.js
@@ -44,6 +44,7 @@ Page({
     ],
     //事务总表对象
     item:{},
+    detpId:187,
     itemId:13,
     active:0,
     result:[],
@@ -62,8 +63,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.setData({itemId:options.id});
-    console.log(options)
+    this.setData({itemId:options.id,deptId:options.deptId});
     //this.getApprovalItemList();
     this.groupList();
     this.townList();
@@ -256,7 +256,7 @@ Page({
   },
   groupList:function(){
       let data = {
-        deptId : 187,
+        deptId : this.data.deptId,
         deptLevel:1
       }
     UTIL.httpRequest(API.URL_GET_USERLIST,data ,{
@@ -270,7 +270,7 @@ Page({
   },
   villageList:function(){
     let data = {
-      deptId : 187,
+      deptId : this.data.deptId,
       deptLevel:2
     }
   UTIL.httpRequest(API.URL_GET_USERLIST,data ,{
diff --git a/pages/index/index.js b/pages/index/index.js
index c9bfd9f..3736bad 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -276,6 +276,7 @@ Page({
         success: (res) => {
           if (res.code == API.SUCCESS_CODE) {
             this.setData({userInfoObj:res.user})
+            console.log(res.user);
             this.setData({region:res.user.deptName})
             this.setData({item:JSON.stringify(res.user)})
             this.getBookList()
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7d79f60..33c0ce4 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -11,7 +11,7 @@
                 <text class="name">{{userInfoObj.nickName}}</text>
                 <view class="jobs">
                     <view class="icon" style="background:url('../../image/index/header_job.png') no-repeat; background-size: 100% 100%;"></view>
-                     {{userInfoObj.remark}}
+                     {{userInfoObj.roles.length>0?userInfoObj.roles[0].roleName:""}}
                 </view>
             </view>
             <view class="task_wrap ">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1c90d02..6cc69ac 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -39,7 +39,7 @@
 }
 .information_header  .name_wrap .jobs{
   margin-left: 18rpx;
-  width: 155rpx;
+  /* width: 155rpx; */
   height: 40rpx;
   background: #5bae75;
   border:2rpx solid #2c8e68;
@@ -49,6 +49,7 @@
   font-size: 28rpx;
   justify-content: center; 
   align-items: center;
+  padding: 0 20rpx;
 }
 .information_header .name_wrap .jobs .icon{
   width: 26rpx;