diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java index 784bff7..3b69858 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java @@ -389,20 +389,24 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl lqw = Wrappers.lambdaQuery(); -// lqw.eq(Gzaiccode::getScountrycode, orgCode); -// Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw); -// return "穗" + gzaiccode.getSregorgname().substring(3, 4); - // 不再维护gzaiccode表 - Map map = Constant.GZ_REGION_CODE_SHORTNAME; - String shortName = "穗"; - for (String code : map.keySet()) { - if (code.equals(orgCode) && !map.get(code).equals("穗")) { - shortName += map.get(code); - break; - } + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(Gzaiccode::getScountrycode, orgCode); + Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw); + if (gzaiccode == null) { + return "蒙"; + } else { + return gzaiccode.getShortname(); } - return shortName; + // 不再维护gzaiccode表 +// Map map = Constant.GZ_REGION_CODE_SHORTNAME; +// String shortName = "穗"; +// for (String code : map.keySet()) { +// if (code.equals(orgCode) && !map.get(code).equals("穗")) { +// shortName += map.get(code); +// break; +// } +// } +// return shortName; } @Override