Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaterialApiServiceImpl.java

@@ -310,8 +310,11 @@ public class MaterialApiServiceImpl implements MaterialApiService {
                             (a, b) -> a
                     ));
             result.forEach(dto -> {
+                //小程序去判断逻辑
+                if (dto.getMaterialType() != null && dto.getMaterialType() == 6) {
                     TabMiniprogramSetting miniprogramSetting = settingMap.get(dto.getAppId());
                     dto.setMaterialDesc(miniprogramSetting == null ? "--" : miniprogramSetting.getMiniprogramName());
+                }
             });
         }
         return PageUtil.changePageHelperToCurrentPage(page, MaterialDTO.class);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -293,7 +293,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             if (null != user) {
                 Integer status = user.getStatus();
                 // 1=已激活，2=已禁用，4=未激活，5=退出企业。
-                log.info("企业微信用户状态：{}",status);
+                log.info("企业微信用户状态：{}", status);
                 if (status == 1) {
                     log.info("企业微信用户存在，并且已激活无需删除:{}:{}", wxEnterpriseId, userid);
                     return;
@@ -316,7 +316,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationApiService.listByStaffId(wxEnterpriseId, staffId);
             if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
                 for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
-                    staffClerkRelationApiService.unbindByStaffAndClerkId(staffId,staffClerkRelationDTO.getClerkId());
+                    staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, staffClerkRelationDTO.getClerkId());
                 }
             }
         }
@@ -475,13 +475,13 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("clerkId未绑定:clerkId={}", clerkId);
             return false;
         }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(relation.getWxEnterpriseId()) ;
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(relation.getWxEnterpriseId());
         if (qwDTO == null) {
             log.info("企业为空");
             return false;
         }
         StaffDTO staffDTO = staffApiService.selectById(relation.getStaffId());
-        String corpid = qwDTO.getThirdCorpid() ;
+        String corpid = qwDTO.getThirdCorpid();
         String wxUserId = "";
         if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
@@ -560,7 +560,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         String title = jsonObject.getString("title");
         String content = jsonObject.getString("content");
         String memberName = jsonObject.getString("memberName");
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO == null) {
             log.info("企业为空");
             return;
@@ -583,7 +583,8 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     @Override
     public String getNewWxUserIdByStaffId(String wxEnterpriseId, String staffId) {
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        log.info("请求wxEnterpriseId:{},staffId:{}", wxEnterpriseId, staffId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO == null) {
             return "";
         }