优化租赁库同步

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hire/service/impl/DepositoryManageBaseServiceImpl.java

@@ -45,6 +45,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -357,12 +358,22 @@ public class DepositoryManageBaseServiceImpl extends ServiceImpl<DepositoryManag
         sysOrg.setCounty(depositoryInfo.getDepositoryCountyName());
         sysOrg.setAddress(depositoryInfo.getDepositoryAddress());
 
-        TSysOrg byId = tHireOrgService.getById(vo.getId());
-        if (byId == null) {
+        //检查记录是否存在
+        TSysOrg existing = tHireOrgService.getById(vo.getId());
+        try {
+            if (existing == null) {
+                // 新增逻辑
                 sysOrg.setCreateDate(new Date());
                 sysOrg.setUpdateDate(new Date());
                 tHireOrgService.save(sysOrg);
             } else {
+                // 更新逻辑
+                sysOrg.setUpdateDate(new Date());
+                tHireOrgService.updateById(sysOrg);
+            }
+        } catch (DataIntegrityViolationException e) {
+            // 捕获主键冲突（可能在高并发时发生）
+            log.error("主键冲突，自动转为更新模式: {}", vo.getId());
             sysOrg.setUpdateDate(new Date());
             tHireOrgService.updateById(sysOrg);
         }