From 69392ee61cdcc5fd2cfd89c89eb7318092c3c68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?=
 <125556714+Topfunplus@users.noreply.github.com>
Date: Thu, 19 Jun 2025 10:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加调试日志，便于跟踪保存操作流程
- 修改组织编码处理逻辑，支持直接传递编码而非主键- 优化自动投放逻辑，增加日志记录和异常处理
- 修复传入数据异常时的错误提示
---
 .../openapi/mmpac/pmo/PmoResource.java        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java
index 144e78f..b005508 100644
--- a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java
+++ b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java
@@ -15,6 +15,7 @@ import nc.bs.logging.Log;
 import nc.jdbc.framework.processor.MapListProcessor;
 import nc.util.mmf.framework.base.MMCollectionUtil;
 import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
+import nc.vo.org.OrgVO;
 import nc.vo.pub.BusinessException;
 import nc.ws.opm.pub.utils.result.APIErrCodeEnum;
 import nccloud.api.mmpac.pmo.IAPIPmoMaintainService;
@@ -41,6 +42,7 @@ public class PmoResource extends AbstractNCCRestResource {
     @Consumes({"application/json"})
     @Produces({"application/json"})
     public JSONString save(Map<String, Object> paramMap) {
+        logger.debug("=================��ʼ�����������������ı������,��������Ϊ ���漴���� �������Զ���������Ͷ��================");
         List<Map<String, Object>> paramList = (List) paramMap.get("data");
         PMOAggVO[] insertBills = null;
 
@@ -53,28 +55,29 @@ public class PmoResource extends AbstractNCCRestResource {
                         return ResultMessageUtil.exceptionToJSON("���������쳣������Ҫ������ͷ��Ϣ", APIErrCodeEnum.BUSINESSEXCCODE.getCode());
                     }
                 }
-
                 IAPIPmoMaintainService serv = (IAPIPmoMaintainService) NCLocator.getInstance().lookup(IAPIPmoMaintainService.class);
                 insertBills = serv.save(paramList);
-
                 // ����paramList���ж���֯�Ƿ���Ҫ�Զ�Ͷ��
                 for (Map<String, Object> map : paramList) {
                     Map<String, Object> head = (Map<String, Object>) map.get(HEADTABLE);
                     if (head == null) continue;
                     String pk_org = (String) head.get("pk_org");
-                    String orgCode = null;
-                    orgCode = httpPostOtherSys.transferCodeByPk("org_orgs", "code", "pk_org", pk_org);
-                    logger.debug("ת��pk_org[" + pk_org + "]Ϊ��֯����[" + orgCode + "]");
-                    boolean isIncludeOrg = false;
-                    isIncludeOrg = httpPostOtherSys.checkIfIncludeOrg(orgCode);
+                    String orgCode = pk_org;
+                    // ������ݵ�������
+                    if (pk_org.length() >= 20) {
+                        throw new BusinessException("���������쳣'pk_org'������Ӧ��Ϊ�����������");
+                    }
+                    logger.debug("���ݵ���֯������,Ϊcode[" + pk_org + "]");
+                    boolean isIncludeOrg = httpPostOtherSys.checkIfIncludeOrg(orgCode);
                     logger.debug("����Ƿ�Ϊ����[" + orgCode + "]���أ�" + isIncludeOrg);
                     if (isIncludeOrg) {
+                        logger.debug("��ǰ�����֯Ϊ����,����Ͷ�Ų���");
                         IPMOBusinessService putService = (IPMOBusinessService) NCLocator.getInstance().lookup(IPMOBusinessService.class);
                         try {
                             putService.rowput(insertBills);
-                            logger.info("�Զ�Ͷ����ɣ�orgCode=" + orgCode);
+                            logger.info("==================�Զ�Ͷ����ɣ�orgCode=" + orgCode);
                         } catch (Exception e) {
-                            logger.error("�Զ�Ͷ��ʧ�ܣ�orgCode=" + orgCode, e);
+                            logger.error("==================�Զ�Ͷ��ʧ�ܣ�orgCode=" + orgCode, e);
                         }
                     }
                 }
@@ -82,7 +85,7 @@ public class PmoResource extends AbstractNCCRestResource {
                 return ResultMessageUtil.toJSON(insertBills, "����������������ɹ�");
             }
         } catch (Exception e) {
-            logger.error("�����������������쳣", e);
+            logger.error("===========================�����������������쳣", e);
             return ResultMessageUtil.exceptionToJSON(e);
         }
     }