diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java index ad9669f10..f5a4bc911 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java @@ -30,9 +30,6 @@ public class HyOpenAreaInfoDAO { } public List queryByKeyword(String keyword,Boolean filterData){ - if (StringUtils.isEmpty(keyword)){ - return new ArrayList<>(); - } return hyOpenAreaInfoMapper.queryByKeyword(keyword,filterData); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml index e070f52e1..ed9fe563c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml @@ -84,7 +84,7 @@ partner_url = #{record.partnerUrl}, tencent_video_account = #{record.tencentVideoAccount}, tencent_video_key = #{record.tencentVideoKey}, - update_user_id = #{record.updateUserId}, + update_user_id = #{record.updateUserId} where id = #{record.id} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index 3b3cbfc51..70be2f6fc 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -112,7 +112,7 @@ (#{record.mappingId}, #{record.openAreaMappingId}, - #{record.type} + #{record.type}) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index 5701dd529..523cb2e69 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -185,10 +185,14 @@ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java index 2ab4301ac..e2f54481a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java @@ -26,6 +26,7 @@ public class AdvanceSettingServiceImpl implements AdvanceSettingService { if (advancedSettingRequest.getId()!=null){ //修改 updateAdvanceSetting(userId,advancedSettingRequest); + return Boolean.TRUE; } HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO(); hyAdvancedSettingDO.setCreateUserId(userId); @@ -38,7 +39,7 @@ public class AdvanceSettingServiceImpl implements AdvanceSettingService { private Boolean updateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) { HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO(); - hyAdvancedSettingDO.setCreateUserId(userId); + hyAdvancedSettingDO.setUpdateUserId(userId); hyAdvancedSettingDO.setId(advancedSettingRequest.getId()); hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl()); hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 5fb5b549e..f0bf8dcec 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -41,6 +41,8 @@ public class OpenAreaServiceImpl implements OpenAreaService { List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,flag); Set longSet = hyOpenAreaInfoDOS.stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toSet()); + List result = new ArrayList<>(); + result.addAll(hyOpenAreaInfoDOS); hyOpenAreaInfoDOS.stream().forEach(x->{ Long parentId = x.getParentId(); @@ -48,11 +50,11 @@ public class OpenAreaServiceImpl implements OpenAreaService { //添加到集合中 longSet.add(x.getParentId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = longHyOpenAreaInfoDOMap.get(parentId); - hyOpenAreaInfoDOS.add(hyOpenAreaInfoDO); + result.add(hyOpenAreaInfoDO); } }); - JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(hyOpenAreaInfoDOS)), "id", "parentId","childNode" ); + JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(result)), "id", "parentId","childNode" ); List openAreaTreeVOS = JSONObject.parseArray(objects.toJSONString(), OpenAreaTreeVO.class); return openAreaTreeVOS; }