Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -2090,6 +2090,7 @@
                     XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
                     if(isCodeOrGroupCode) {
                        if(StringUtils.isBlank(groupCode)){
                           errorid="1";
                           mes+="；申请的编码类型为集团码，等待集团编码赋值";
                        }
                        resultDataObjectDetailDO.setCode(groupCode);
@@ -2157,14 +2158,16 @@
               }
               if(isCodeOrGroupCode) {
                  if(StringUtils.isBlank(groupCode)){
                     resultDataObjectDetailDO.setErrorid("1");
                     msg="申请的编码类型为集团码，等待集团编码赋值";
                  }
                  resultDataObjectDetailDO.setCode(groupCode);
               }else{
                  resultDataObjectDetailDO.setCode(code);
                  resultDataObjectDetailDO.setErrorid("0");
               }
               resultDataObjectDetailDO.setId(sourceOid);
               resultDataObjectDetailDO.setErrorid("0");

               resultDataObjectDetailDO.setMsg(msg);
               resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
               //处理传送的数据中关键属性重复的，直接拿到已经申请到编码的数据编码直接将赋给关键属性重复的数据
@@ -2325,9 +2328,9 @@
      sb.append(tableName);
      sb.append(" where 1=1 ");
      if(isCodeOrGroupCode) {
         sb.append(" groupcode in (");
         sb.append(" and groupcode in (");
      }else{
         sb.append(" id in (");
         sb.append(" and id in (");
      }
      sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
      sb.append(")");
@@ -2359,7 +2362,7 @@
         RowDatas rowData=codeDataMap.get(code);
         String status=rowData.getStatus();
         String operation=rowData.getOperation();
         if (cbo.getTs().compareTo(orderDTO.getTs())==0?true:false) {
         if (cbo.getTs().compareTo(orderDTO.getTs())==0?false:true) {
            // throw new VciBaseException("数据不是最新的，可能他人已经修改，请刷新后再试");
            errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";数据不是最新的，可能他人已经修改，请刷新后再试");
         }
@@ -4013,7 +4016,7 @@
         DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
         for (String key:dataMap.keySet()){
            Object value= dataMap.getOrDefault(key,"");
            clientBusinessObject.setAttributeValue(key,value.toString());
            clientBusinessObject.setAttributeValue(key,value==null?"":value.toString());
         }
         clientBusinessObjectList.add(clientBusinessObject);
      });