修改

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

@@ -160,7 +160,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 .eq(WarehouseBaseInfo.QueryFiles.COMP_ID,AuthSecurityUtils.getCurrentUserInfo().getCompId())
                 .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
                 .eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(warehouseBaseInfo!=null){
+        if(!StringUtils.isEmpty(warehouseBaseInfo.getId())){
             warehouseBaseInfo.setPersonChargeKey(contractManagementInfo.getPersonChargeKey());
             warehouseBaseInfo.setPersonCharge(contractManagementInfo.getPersonCharge());
             warehouseBaseInfo.setPersonPhone(contractManagementInfo.getPersonPhone());
@@ -292,7 +292,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                             .eq("contract_no",contractManagementInfo1.getContractNo())
                             .eq("delete_flag","0"));
-                    if (tranTaskInfo!=null) {
+                    if (!StringUtils.isEmpty(tranTaskInfo.getId())) {
                         //定义装车净重
                         Float loadNetWeight = 0.0f;
                         //定义卸车净重

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

@@ -4,6 +4,7 @@ import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -172,7 +173,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
                         .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID, commonId)
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(identityAuthenticationInfo!=null){
+        if(!StringUtils.isEmpty(identityAuthenticationInfo.getId())){
             //身份审核中
             if ("1".equals(identityAuthenticationInfo.getAuthenticationStatusKey())){
                 throw new AppServiceException(ExceptionDefinition.IDENTITY_IS_BEING_AUDITED);
@@ -195,7 +196,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     public String examine(String id, Integer flag) {
         //查询粮商列表
         IdentityAuthenticationInfo identityAuthenticationInfo = this.selectById(id);
-        if (identityAuthenticationInfo != null ){
+        if (!StringUtils.isEmpty(identityAuthenticationInfo.getId())){
             //通过
             if(flag==1){
                 identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());

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

@@ -303,7 +303,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         .eq("contract_no", warehouseInOutInfo.getContractNo())
                         .eq("car_no",warehouseInOutInfo.getCarNo())
                         .eq(TranCarInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0));
-                    if (tranCarInfo!=null){
+                    if (!StringUtils.isEmpty(tranCarInfo.getId())){
                         //将到货数据同步到派车表
                         tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
                         tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());