修改已有bug

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -62,6 +62,7 @@ public class SweepCodeService {
         }
         queryParam.put("uptownId", uptownId);
         queryParam.put("orderStr", "  suu.unit_id asc,suho.linkman ");
+        queryParam.put("unitType", 7000); // 对应的sql查询中部门大于7000
 
         List<ExcelRiBaoLYBM4> sysUptownHouses = rbMapper.exSelectLingyunUserPage(pageDb,queryParam);
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
@@ -249,6 +250,7 @@ public class SweepCodeService {
 
     public List<ExcelRiBaoLYBM4> exSelectLingyunUser(Map<String, Object> queryParam, Long uptownId, Long userId) throws ParseException {
         queryParam.put("uptownId", uptownId);
+        queryParam.put("unitType", 7000); // 对应的sql查询中部门大于7000
         List<ExcelRiBaoLYBM4> sysUptownHouses = rbMapper.exSelectLingyunUser(queryParam);
 
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -461,6 +461,7 @@ public class ScanAdminController {
     @ApiOperation("手机号变更")
     @PostMapping("/whepi/user/editPhone")
     public Model editPhone(@JsonBody UptownHome uptownHome) {
+        uptownHome.setStatus(1);
         return Model.newSuccess(uptownHomeMapper.updateById(uptownHome));
     }
 

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -38,7 +38,10 @@
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
-        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} and suu.unit_id > 7000
+        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
+            <if test="unitType != null and unitType != ''">
+                and suu.unit_id > 7000
+            </if>
         left join ms_report msr on msr.house_id = suh.house_id and
         <if test="date!=null and date!=''">
             msr.report_date = #{date}
@@ -164,7 +167,10 @@
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId,suh.house_id as houseId
         from sys_uptown_house suh
         left join sys_uptown_home suho on suho.house_id=suh.house_id
-        left JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.unit_id > 7000
+        left JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id
+        <if test="unitType != null and unitType != ''">
+            and suu.unit_id > 7000
+        </if>
         left join ms_report msr on msr.house_id = suh.house_id
         <if test="date!=null and date!=''">
             and msr.report_date = #{date}