bug 修复

src/main/java/com/yunzhi/marketing/controller/TaNewsController.java

@@ -164,8 +164,11 @@ public class TaNewsController extends BaseController {
                                         @RequestBody TaNews taNews,
                                      HttpServletRequest request){
         taNews.setNewsId(id);
-        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
-        taNews.setCityId(cityId);
+        if (!StringUtils.isEmpty(taNews.getBuildingId())){
+            Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+            taNews.setCityId(cityId);
+        }
+
         taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         if ("1".equals(String.valueOf(taNews.getNewsStatus()))){

src/main/java/com/yunzhi/marketing/controller/TaOrgCityController.java

@@ -67,6 +67,8 @@ public class TaOrgCityController extends BaseController {
     @ApiOperation(value = "删除此项目的城市", notes = "添加此项目的城市")
     @DeleteMapping(value = "/admin/org/city/{id}")
     public ResponseBean deleteCity(@PathVariable Integer id, HttpServletRequest request) {
-        return ResponseBean.success(taOrgCityMapper.deleteById(id));
+        LambdaQueryWrapper<TaOrgCity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaOrgCity::getCityId,id);
+        return ResponseBean.success(taOrgCityMapper.delete(queryWrapper));
     }
 }

src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java

@@ -112,7 +112,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         }
 
         //-- 校验 公司，楼盘，资讯类型
-        check(taNews);
+//        check(taNews);
 
         BeanTools.copyProperties(taNews, oldNews);
         this.updateById(oldNews);

src/main/java/com/yunzhi/marketing/xlk/mapper/SceneLogMapper.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
@@ -10,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,5 +24,5 @@ import java.util.List;
 @Mapper
 public interface SceneLogMapper extends BaseMapper<SceneLog> {
 
-    List<BuildingLogVO> getBuildingLogs(Page<BuildingLogVO> page, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList, @Param("institutionIds") List<String> institutionIds);
+    IPage<BuildingLogVO> getBuildingLogs(Page<BuildingLogVO> page, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList, @Param("institutionIds") List<String> institutionIds);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/SceneLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -46,7 +48,7 @@ public class SceneLogServiceImpl extends ServiceImpl<SceneLogMapper, SceneLog> i
     @Override
     public ResponseBean getBuildingLogs(Integer pageNum, Integer pageSize, String buildingId, List<TaPersonBuilding> taPersonBuildingList, List<String> InstitutionIds) {
         Page<BuildingLogVO> page = new Page<>(pageNum, pageSize);
-        List<BuildingLogVO> buildings = this.baseMapper.getBuildingLogs(page, buildingId, taPersonBuildingList, InstitutionIds);
+        IPage<BuildingLogVO> buildings = this.baseMapper.getBuildingLogs(page, buildingId, taPersonBuildingList, InstitutionIds);
         return ResponseBean.success(buildings);
     }
 }