fix(jg):优化设备登记机构代码校验逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -815,7 +815,7 @@ public class CommonEquipDataProcessService {
         // 设备来源，前端无法判断，故后端进行判断，分为新设备(new)、历史有证设备(his)、历史无证设备(black)
         result.put("dataSourceClassify", this.genDataSource(useInfo.getDataSource()));
         // 获取已登记设备的登记证对应接收机构
-        if (registerInfo.getUseOrgCode() != null) {
+        if (!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())) {
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();

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

@@ -232,6 +232,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 //				}
 //			}
 			SortVo sortMap = userInfoService.sortFieldConversion(sort);
+			// 密评专用（查tz_flc_reg_unit_info表中的admin_login_pwd字段，以用于验证密评数据完整性）
+			regUnitInfoService.lambdaQuery().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfoDto.getUseUnitCode()).select(RegUnitInfo::getUnitCode, RegUnitInfo::getAdminLoginPwd);
 			return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
 		} catch (Exception ex) {
 			String msg = ex.getMessage() == null ? "" : ex.getMessage();