Skip to content

A
amos-boot-biz
Commit 360d2ead authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register' of…

Merge branch 'develop_tzs_register' of http://39.100.92.250:5000/moa/amos-boot-biz into develop_tzs_register
parents b476553b 62990b0a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ 360d2ead
......@@ -1170,6 +1170,7 @@ public class TzBaseEnterpriseInfoServiceImpl
JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
objects.forEach(item -> newData.add(item.toString()));
tzBaseEnterpriseInfo.setAppId(regUnitInfo.getAppId());
tzBaseEnterpriseInfo.setUnitType(String.join("#", unitTypes));
boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
......@@ -1259,6 +1260,8 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitInfo.setAppId(appId);
}
} else {
regUnitInfo.setAppId("");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment