Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -11,7 +12,6 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
@@ -78,7 +78,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
@@ -234,7 +233,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             RegUnitIc regUnitIc = new RegUnitIc();
             model.getRegUnitIc().setUnitCode(model.getUnitCode());
             model.getRegUnitIc().setUnitName(model.getName());
+            model.getRegUnitIc().setRegisteredOrganCode(MapUtil.getStr(dictOfDJJGMap, model.getRegUnitIc().getRegisteredOrgan()));
             Bean.copyExistPropertis(model.getRegUnitIc(), regUnitIc);
+            if (regUnitIcService.count(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, model.getRegUnitIc().getUnitCode())) > 0) {
+                throw new BadRequest("统一信用代码已经存在，请联系管理员！");
+            }
             regUnitIcService.saveOrUpdate(regUnitIc);
             // 5.创建企业信息:tz_base_enterprise_info
             model.setAppId(regUnitInfo.getAppId());