bugfix

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsEnterpriseResDto.java

@@ -130,7 +130,7 @@ public class KwsEnterpriseResDto implements Serializable {
     /**
      * 企业地址-----区域表id---实际用途？
      */
-    private Integer cityName;
+    private String cityName;
 
     /**
      * 企业详细地址

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -162,7 +162,7 @@ public class KwsUserController {
 
     @PostMapping("testEdit")
     public HttpResult testEdit() {
-        return HttpResult.ok(HttpStatus.MSG_005);
+        return HttpResult.ok(kwsUserService.test());
     }
 
     @PostMapping("testApprove")

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -217,7 +217,6 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             BeanUtils.copyProperties(kwsEnterpriseResDto, entCacheResDto);
             entCacheResDto.setDeptInfo(remoteBaseService.queryDeftInfoByEntId(entId));
             entCacheResDto.setCertificateInfo(remoteBaseService.queryCertificateByEntId(entId));
-            remoteBaseService.fillRelate(entCacheResDto);
             RedissonUtils.putString(key, JSON.toJSONString(entCacheResDto), Global.COMMON_EXPIRE);
             return entCacheResDto;
         }
@@ -261,7 +260,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         Map<Long, EntCacheResDto> result = new HashMap<>();
         for (Long entId : entIdList) {
             EntCacheResDto entCacheResDto = queryEntCacheById(entId);
-
+            remoteBaseService.fillRelate(entCacheResDto);
             //有主体单位
             String entDeptIds = entCacheResDto.getEntDeptIds();
             if (StringUtils.isNotBlank(entDeptIds)) {

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

@@ -11,6 +11,7 @@ import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
 import com.sckw.system.api.model.dto.res.RegisterResDto;
 import com.sckw.system.dao.*;
+import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindEntListPojo;
 import com.sckw.system.model.vo.req.*;
@@ -57,6 +58,9 @@ public class KwsUserService {
     @Autowired
     KwsMenuService kwsMenuService;
 
+    @Autowired
+    private RemoteSystemServiceImpl remoteSystemService;
+
     /**
      * @param reqVo 入参
      * @desc: 新增
@@ -572,4 +576,9 @@ public class KwsUserService {
         //重置密码
         updatePwd(reqVo.getNewPassword(), kwsUser);
     }
+
+    public String test() {
+        remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong("156382319450525696")));
+        return "";
+    }
 }