Selaa lähdekoodia

同德堂的测试/同步客户群

三七 4 päivää sitten
vanhempi
commit
337bb59978

+ 0 - 2
fs-company/src/main/java/com/fs/company/controller/qw/QwGroupChatUserController.java

@@ -35,7 +35,6 @@ public class QwGroupChatUserController extends BaseController
     /**
      * 查询客户群成员列列表
      */
-    @PreAuthorize("@ss.hasPermi('qw:group_chat_user:list')")
     @GetMapping("/list")
     public TableDataInfo list(QwGroupChatUser qwGroupChatUser)
     {
@@ -48,7 +47,6 @@ public class QwGroupChatUserController extends BaseController
     /**
      * 获取客户群成员列详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qw:group_chat_user:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

+ 3 - 2
fs-service/src/main/java/com/fs/qw/service/impl/QwGroupChatServiceImpl.java

@@ -341,12 +341,13 @@ public class QwGroupChatServiceImpl implements IQwGroupChatService
 
                         //邀请人id
                         String nnvitorId = null;
-                        if (type == 1) {
+
+                        if (type == 1 && item != null && item.getInvitor() != null && !StringUtil.strIsNullOrEmpty(item.getInvitor().getUserId())) {
                             nnvitorId = item.getInvitor().getUserId();
                         }
                         //微信unionid
                         String unionid = null;
-                        if (type == 2) {
+                        if (type == 2 && !StringUtil.strIsNullOrEmpty(item.getUnionid())) {
                             unionid = item.getUnionid();
                         }