Merge branch 'bugfix-0517'

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

@@ -296,20 +296,16 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId);
                 }
                 //有活码权限的企业
-                boolean flag = rightService.hasRightForAdmin(enterpriseId, "hb_m0206");
-                if (flag) {
-                    // 绑定自动创建活码
-                    HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
-                    hmQrcodeQDTO.setHmType(1);
-                    hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
-                    hmQrcodeQDTO.setEnterpriseId(enterpriseId);
-                    hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
-                    hmQrcodeQDTO.setPassFlag(1);
-                    hmQrcodeQDTO.setStoreId(dto.getStoreId());
-                    hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
-                    hmQrcodeQDTO.setInvokingType(channelCode);
-                    hmQrcodeApiService.add(hmQrcodeQDTO);
-                }
+                HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
+                hmQrcodeQDTO.setHmType(1);
+                hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
+                hmQrcodeQDTO.setEnterpriseId(enterpriseId);
+                hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
+                hmQrcodeQDTO.setPassFlag(1);
+                hmQrcodeQDTO.setStoreId(dto.getStoreId());
+                hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
+                hmQrcodeQDTO.setInvokingType(channelCode);
+                hmQrcodeApiService.add(hmQrcodeQDTO);
             }
             //推入日志
             staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), channelCode, staffClerkRelationId);

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

@@ -787,11 +787,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             String enterpriseId = wxEnterpriseDTO.getEnterpriseId();
             //查询出所有正常的导购
             String wxEnterpriseId = wxEnterpriseDTO.getWxEnterpriseId();
-            boolean flag = rightService.hasRightForAdmin(enterpriseId, "hb_m0206");
-            if (!flag) {
-                logger.info("该企业未与gic关联，无需开启：enterpriseId:{},wxEnterpriseId:{}", enterpriseId, wxEnterpriseId);
-                continue;
-            }
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("wxEnterpriseId", wxEnterpriseId);
             jsonObject.put("enterpriseId", enterpriseId);