From 9eb20d571812a0c16c502f237ad03f2d5898a408 Mon Sep 17 00:00:00 2001
From: tangzp <tangzp@jujiatech.com>
Date: Fri, 28 Feb 2025 11:04:12 +0800
Subject: [PATCH] bug

---
 mztb/src/main/java/cc/smtweb/biz/mztb/web/base/PartyInfo.java       | 4 ++--
 .../biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java       | 6 +-----
 .../cc/smtweb/biz/mztb/web/base/partyInfo/PartyInfoHandler.java     | 6 +-----
 .../main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java | 6 +++---
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/PartyInfo.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/PartyInfo.java
index 8281a25..7b3e4a9 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/PartyInfo.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/PartyInfo.java
@@ -151,12 +151,12 @@ public class PartyInfo extends DefaultEntity {
     public void setNationalEconomyType(String pi_national_economy_type) {
         put("pi_national_economy_type", pi_national_economy_type);
     }
-    /** 系统机构Id */
+    /** 民政系统机构Id */
     public long getSysPartyId() {
         return getLong("pi_sys_party_id");
     }
 
-    /** 系统机构Id */
+    /** 民政系统机构Id */
     public void setSysPartyId(long pi_sys_party_id) {
         put("pi_sys_party_id", pi_sys_party_id);
     }
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
index 268ba9a..99c4f36 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
@@ -96,11 +96,7 @@ public class PartyDataFillHandler {
             bean.setUser(UserCache.getInstance().getNameById(us.getUserId()));
             DbEngine instance = DbEngine.getInstance();
             // 将机构表数据同步到填报主表机构信息中
-            final List<PartyInfo> partyInfos = instance.queryWhere(PartyInfo.class, " pi_sys_party_id = ? ", us.getPartyId());
-            if(partyInfos == null || partyInfos.size() == 0){
-                throw new BizException("未找到机构信息");
-            }
-            PartyInfo partyInfo = partyInfos.get(0);
+            PartyInfo partyInfo = instance.queryEntity(PartyInfo.class, us.getPartyId());
             SwMap partyInfoData = partyInfo.getData();
             partyInfoData.remove("pi_update_at");
             partyInfoData.remove("pi_sys_party_id");
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyInfo/PartyInfoHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyInfo/PartyInfoHandler.java
index d0d39a1..bc4c5e2 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyInfo/PartyInfoHandler.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyInfo/PartyInfoHandler.java
@@ -62,11 +62,7 @@ public class PartyInfoHandler extends AbstractHandler {
         }catch (SQLException sqlException) {
             logger.debug("创建 Connection Exception：",sqlException);
         }
-        final List<PartyInfo> partyInfos = instance.queryWhere(PartyInfo.class, " pi_sys_party_id = ? ", us.getPartyId());
-        if(partyInfos == null || partyInfos.size() == 0){
-            throw new BizException("未找到机构信息");
-        }
-        PartyInfo partyInfo = partyInfos.get(0);
+        PartyInfo partyInfo = instance.queryEntity(PartyInfo.class, us.getPartyId());
         DbUtil dbUtil = new DbUtil(connection);
         SwMap swmap = partyInfo.getData();
         // 处理前置库和本系统 机构表不同的字段
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
index fad78fc..1752559 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
@@ -107,6 +107,7 @@ public class MztbController {
         List<UserStatu> addUserStatuList = new ArrayList<>();
         Set<String> orgCodeMap = new HashSet<>();
         for (Map<String, Object> orgInfo : paramData) {
+            orgInfo.remove("pt_id");    //不要民政端的主键
             SwMap data = new SwMap();
             data.putAll(orgInfo);
             String orgCode = data.readString("pi_credit_code");
@@ -120,7 +121,7 @@ public class MztbController {
             //新增或同步机构数据
             PartyInfo partyInfo = new PartyInfo();
             partyInfo.init();
-            partyInfo.getData().putAll(orgInfo);
+
             if(tbPartyInfoMapByCode.containsKey(orgCode)){
                 //机构已存在，只更新数据
                 partyInfo.setId(tbPartyInfoMapByCode.get(orgCode).getId());
@@ -130,7 +131,7 @@ public class MztbController {
                 partyInfo.setId(DbEngine.getInstance().nextId());
                 addPartyInfoList.add(partyInfo);
             }
-
+            partyInfo.getData().putAll(orgInfo);
             //判断系统机构是否存在 ，不存在 则新增
             Party party = PartyCache.getInstance().getByCode(orgCode);
             if (party == null) {
@@ -144,7 +145,6 @@ public class MztbController {
                 addPartyList.add(party);
                 addPartyIdSet.add(String.valueOf(party.getId()));
             }
-            partyInfo.setSysPartyId(party.getId());
             //添加系统用户
             User user = UserCache.getInstance().getByCode(partyInfo.getCreditCode());
             if(user == null){