1.并发修改

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
@@ -401,8 +402,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			regUnitInfoDto.setName(String.valueOf(resultMap.get("unitName")));
 			regUnitInfoDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
 			String industryName = "";
-			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")),"HYXLDM");
-			if(!ValidationUtil.isEmpty(dataDictionary)) {
+			List<DataDictionary> dictionaries = this.initAllDataDictionaryList();
+			Optional<DataDictionary> op = dictionaries.stream().filter(d->d.getCode().equals(String.valueOf(resultMap.get("industryCode"))) && "HYXLDM".equals(d.getType())).findFirst();
+			if(op.isPresent()) {
+				DataDictionary dataDictionary = op.get();
 				industryName = dataDictionary.getName();
 			}
 			String approveDate = String.valueOf(resultMap.get("approval_time"));
@@ -496,7 +499,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				String json = redisUtil.get(BizCommonConstant.TCM_ALL_DATA_DICT_REDIS_KEY).toString();
 				dictionaries = JSONObject.parseArray(json, DataDictionary.class);
 			} else{
-				dictionaries = dataDictionaryService.list();
+				dictionaries = dataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(BaseEntity::getIsDelete,false));
 				redisUtil.set(BizCommonConstant.TCM_ALL_DATA_DICT_REDIS_KEY, JSONObject.toJSONString(dictionaries));
 			}
 		}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="ERROR">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->