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

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/AddEntSettleReqVo.java

@@ -88,13 +88,13 @@ public class AddEntSettleReqVo implements Serializable {
     /**
      * 企业地址
      */
-//    @NotNull(message = "企业地址编码不能为空")
+    @NotNull(message = "企业地址编码不能为空")
     private Integer cityCode;
 
     /**
      * 企业地址名
      */
-    @NotBlank(message = "企业地址名不能为空")
+//    @NotBlank(message = "企业地址名不能为空")
     private String cityName;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -68,6 +68,9 @@ public class KwsEnterpriseService {
     @Autowired
     private RemoteSystemServiceImpl remoteSystemService;
 
+    @Autowired
+    private SysAreaDao sysAreaDao;
+
     /**
      * @param params 入库
      * @desc: 单表入库
@@ -265,7 +268,10 @@ public class KwsEnterpriseService {
         kwsEnterprise.setHead(reqVo.getHead());
         kwsEnterprise.setRegSource(LoginUserHolder.getClientType());
         kwsEnterprise.setCityCode(reqVo.getCityCode());
-        kwsEnterprise.setCityName(reqVo.getCityName());
+        SysArea sysArea = sysAreaDao.selectById(reqVo.getCityCode());
+        if (Objects.nonNull(sysArea)) {
+            kwsEnterprise.setCityName(sysArea.getMergerName());
+        }
         kwsEnterprise.setDetailAddress(reqVo.getDetailAddress());
         kwsEnterprise.setLat(reqVo.getLat());
         kwsEnterprise.setLng(reqVo.getLng());