修改

blade-service-api/person-api/src/main/java/org/springblade/person/entity/HouseUser.java

@@ -30,6 +30,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -42,7 +43,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @TableName("personnel_house_user")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "住户", description = "住户")
-public class HouseUser extends BaseEntity {
+public class HouseUser extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
 

blade-service-api/person-api/src/main/java/org/springblade/person/feign/HouseUserClientFallback.java

@@ -105,11 +105,6 @@ public class HouseUserClientFallback implements IHouseUserClient {
 		return null;
 	}
 
-	@Override
-	public Integer count(String tenantId) {
-		return null;
-	}
-
     @Override
     public int count(@Valid HouseUser houseUser) {
         return 0;

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IHouseUserClient.java

@@ -114,11 +114,6 @@ public interface IHouseUserClient {
 	@PostMapping("/yxfCount")
 	Integer yxfCount(@RequestBody List<Long> ids);
 
-	/**
-	 * 数量
-	 */
-	@GetMapping("/count")
-	Integer count(@RequestParam(value = "tenantId", required = false) String tenantId);
 	/**
 	 * 数量统计
 	 * @param houseUser

blade-service/community/src/main/java/org/springblade/community/controller/statistic/controller/StatisticsController.java

@@ -920,7 +920,9 @@ public class StatisticsController extends BladeController {
 		Integer enterpriseCount = enterpriseClient.count(bladeUser.getTenantId());
 		Integer staffCount = staffClient.count(bladeUser.getTenantId());
 		Integer serverUserCount = serverUserClient.count(bladeUser.getTenantId());
-		Integer houseUserCount = houseUserClient.count(bladeUser.getTenantId());
+		HouseUser houseUser = new HouseUser();
+		houseUser.setTenantId(bladeUser.getTenantId());
+		Integer houseUserCount = houseUserClient.count(houseUser);
 		return R.data(DataStaticVO.builder()
 			.agencyList(agencyList)
 			.agencyCount(agencyCount)

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -169,12 +169,6 @@ public class HouseUserClient implements IHouseUserClient {
 		return houseUserService.count(Condition.getQueryWrapper(new HouseUser()).lambda().in(CollUtil.isNotEmpty(ids),HouseUser::getId, ids));
 	}
 
-	@Override
-	@GetMapping("/count")
-	public Integer count(@RequestParam(value = "tenantId", required = false) String tenantId) {
-		return houseUserService.count();
-	}
-
     @Override
 	@PostMapping("/count")
 	public int count(@Valid @RequestBody HouseUser houseUser) {

community-app-gateway/src/main/java/org/springblade/app/controller/EstateRepairController.java

@@ -55,41 +55,32 @@ public class EstateRepairController {
 
 	@PostMapping(value = "/addEstateRepair")
 	public Map<String,Object> addEstateRepair(@RequestBody RepairDTO estateRepairDto){
-
 		Map<String,Object> map = new HashMap<>();
 		estateRepairDto.setRepairNo(generateRepairNO());
 		Residential searchResidential = new Residential();
-//		searchResidential.setId(estateRepairDto.getA());
 		Residential residentialById = residentialClient.detail(searchResidential);
 		if(residentialById != null){
-//			estateRepairDto.setOrgPosition(residentialById.getOrgPosition());
 			estateRepairDto.setTenantId(residentialById.getTenantId());
 		}else{
 			map.put("add_result", "小区不存在");
 		}
 		HouseUser searchHouseUser = new HouseUser();
-//		searchHouseUser.setId(estateRepairDto.getReportor());
 		HouseUserVO houseUserVO = houseUserClient.detail(searchHouseUser);
 		if(houseUserVO != null){
 			estateRepairDto.setReportor(houseUserVO.getName());
 			estateRepairDto.setReportorPhone(houseUserVO.getPhone());
 		}
-
 		//处理图片
 		Object pic = map.get("pic");
 		if(pic != null){
 
 		}
 		boolean submit = this.repairClient.submit(estateRepairDto);
-
-
 		if(submit){
 			map.put("add_result",submit);
-
 		}else{
 			map.put("add_result", "后台程序异常");
 		}
-
 		return map;
 	}
 

community-app-gateway/src/main/java/org/springblade/app/controller/MemberController.java

@@ -599,7 +599,6 @@ public class MemberController {
 				hashMap.put("result_msg", "会员id不能为空（member_id）");
 				return hashMap;
 			}
-
 			DoorDevice searchEntity = new DoorDevice();
 			searchEntity.setId(Long.valueOf(device_id));
 			DoorDevice doorDevice = this.doorDeviceClient.detail(searchEntity);

community-app-gateway/src/main/java/org/springblade/app/controller/NoticeController.java

@@ -1,6 +1,7 @@
 package org.springblade.app.controller;
 
 import lombok.RequiredArgsConstructor;
+import org.springblade.core.tool.api.R;
 import org.springblade.estate.dto.NoticeDTO;
 import org.springblade.estate.entity.Notice;
 import org.springblade.estate.feign.INoticeClient;
@@ -25,12 +26,8 @@ public class NoticeController {
 	private final INoticeClient noticeClient;
 
 	@PostMapping(value = "/noticeList")
-	public Map<String,Object> getNoticeList(@RequestBody NoticeDTO noticeDto){
-		Map<String,Object> map = new HashMap<>();
+	public R getNoticeList(@RequestBody NoticeDTO noticeDto){
 		List<Notice> list = this.noticeClient.getListByResidentialId(noticeDto);
-		if(list != null){
-			map.put("noticeList",list);
-		}
-		return map;
+		return R.data(list);
 	}
 }