提交

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -511,7 +511,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
+            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);

src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java

@@ -70,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            //queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -74,8 +75,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @RequestParam(value = "startTime",required = false) LocalDate startTime,
+                                             @RequestParam(value = "endTime",required = false) LocalDate endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -84,8 +85,8 @@ public class TaDrainageRecordController extends BaseController {
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);