1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -65,6 +65,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Autowired
     private IIdentityAuthenticationInfoService identityAuthenticationInfoService;
     @Autowired
+    private ICommonCompanyIdentityService commonCompanyIdentityService;
+    @Autowired
     private ICommonStaffService staffService;
     @Autowired
     private ICommonSysParameterService iCommonSysParameterService;
@@ -627,9 +629,16 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             //校验身份认证
             IdentityAuthenticationInfo identityAuthenticationInfo=identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
                     .eq("customer_number_card",qualityInspectionManagement1.getCustomerNumberCard())
-                    .eq("comp_id",AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId())
                     .eq("authentication_status_key","7"));
-            if (identityAuthenticationInfo==null){
+            if (identityAuthenticationInfo!=null){
+                CommonCompanyIdentity commonCompanyIdentity=commonCompanyIdentityService.selectOne(new EntityWrapper<CommonCompanyIdentity>()
+                    .eq("com_id",AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId())
+                    .eq("identity_id",identityAuthenticationInfo.getId()));
+                if (commonCompanyIdentity==null) {
+                    throw new RuntimeException("身份证号" + qualityInspectionManagement1.getCustomerNumberCard() + "的客户未认证");
+                }
+            }
+            else{
                 throw new RuntimeException("身份证号" + qualityInspectionManagement1.getCustomerNumberCard() + "的客户未认证");
             }
             //中天昊元不能超过500吨