diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcUserPrivilegeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcUserPrivilegeController.java
index 4e77ad27..42c4f43d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcUserPrivilegeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcUserPrivilegeController.java
@@ -58,7 +58,7 @@ public class XhpcUserPrivilegeController extends BaseController {
         //选择用户拥有的数据权限
         ajax.put("dataCheckedKeys", iXhpcUserPrivilegeService.dataCheckedKeys(userId));
         //登录用户拥有的数据权限树
-        ajax.put("dataList", iXhpcUserPrivilegeService.dataList(SecurityUserId));
+        //ajax.put("dataList", iXhpcUserPrivilegeService.dataList(SecurityUserId));
         return ajax;
     }
 
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java
index 80ed6691..7a77d41a 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java
@@ -58,7 +58,7 @@ public class IMechanismServiceImpl implements IMechanismService {
             return regionTree(logUserId,type,tenantId);
         }else if(status==1){
             return operatorTree(logUserId,type,tenantId);
-        }else if(status==1){
+        }else if(status==2){
             return operatorRegionTree(logUserId,type,tenantId);
         }else{
             return tenantOperatorTree(logUserId,type);
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
index c6bdd354..ea23b176 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
@@ -457,41 +457,43 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
             //根据不同的用户类型查询不同的信息
             Long userid = loginUser.getUserid();
             Integer userType = loginUser.getUserType();
-            R user = xhpcCommonController.getMechanism(null, loginUser.getUserid(), loginUser.getUserType(), null, tenantId);
+            R user = xhpcCommonController.getMechanism(null, userid, userType, null, tenantId);
             if(user !=null && user.getData() !=null){
                 Map<String, Object> map = (Map<String, Object>)user.getData();
                 //发票、留言板、版本、客服电话
-                Long invoice =null;
-                String globalInvoice="global:invoice:"+ tenantId +":";
-                if(UserTypeUtil.USER_TYPE.equals(userType)){
-                    invoice = redisService.getCacheObject(globalInvoice + UserTypeUtil.USER + userid);
-                }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
-                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.INTERNET+userid);
-                }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
-                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.COMMUNIT+userid);
-                }else{
-                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.CUSTOMERS+userid);
-                }
-                if(invoice==null){
-                    map.put("invoiceNumber","0");
-                }else{
-                    map.put("invoiceNumber",invoice);
-                }
-                Integer guestbook =null;
-                if(UserTypeUtil.USER_TYPE.equals(userType)){
-                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
-                }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
-                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
-                }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
-                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
-                }else{
-                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
-                }
-                if(guestbook==null){
-                    map.put("guestbook","0");
-                }else{
-                    map.put("guestbook",guestbook);
-                }
+//                Long invoice =null;
+//                String globalInvoice="global:invoice:"+ tenantId +":";
+//                if(UserTypeUtil.USER_TYPE.equals(userType)){
+//                    invoice = redisService.getCacheObject(globalInvoice + UserTypeUtil.USER + userid);
+//                }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
+//                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.INTERNET+userid);
+//                }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
+//                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.COMMUNIT+userid);
+//                }else{
+//                    invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.CUSTOMERS+userid);
+//                }
+//                if(invoice==null){
+//                    map.put("invoiceNumber","0");
+//                }else{
+//                    map.put("invoiceNumber",invoice);
+//                }
+                map.put("invoiceNumber","0");
+//                Integer guestbook =null;
+//                if(UserTypeUtil.USER_TYPE.equals(userType)){
+//                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
+//                }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
+//                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
+//                }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
+//                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
+//                }else{
+//                    guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
+//                }
+//                if(guestbook==null){
+//                    map.put("guestbook","0");
+//                }else{
+//                    map.put("guestbook",guestbook);
+//                }
+                map.put("guestbook","0");
                 map.put("version",version);
                 map.put("servicePhone",servicePhone);
                 map.put("activity",0);
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java
index 41a2c191..f032f835 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java
@@ -24,6 +24,8 @@ import com.xhpc.user.service.XhpcInvoiceService;
 import com.xhpc.order.domain.XhpcHistoryOrder;
 import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -363,7 +365,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
             LoginUser loginUser = tokenService.getLoginUser();
             getCreatorRead(loginUser.getUserid(),loginUser.getUserType(),loginUser.getTenantId());
         }catch (Exception e){
-
+                e.printStackTrace();
         }
         return invoicedOrderResponse;