版本更新

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/BaseMongoDao.java

@@ -25,16 +25,16 @@ public interface BaseMongoDao {
          if (userCondition.checkAuthority()) {
              List<Integer> orgIds = userCondition.getOrgIds();
              if (userCondition.getPermissionType() == 2 || userCondition.getPermissionType() == 5)  {
-                 Criteria criteria1 = Criteria.where("company_org_id").in(orgIds);
-                 Criteria criteria2 = Criteria.where("dept_org_id").in(orgIds);
+                 Criteria criteria1 = Criteria.where("companyOrgId").in(orgIds);
+                 Criteria criteria2 = Criteria.where("deptOrgId").in(orgIds);
                  criteria.orOperator(criteria1, criteria2);
              }
              if (userCondition.getPermissionType() == 4 || userCondition.getPermissionType() == 3)  {
-                 criteria.and("dept_org_id").in(orgIds);
+                 criteria.and("deptOrgId").in(orgIds);
              }
              if (userCondition.getPermissionType() == 1)  {
-                 criteria.and("company_org_id").in(orgIds);
-                 criteria.and("dept_org_id").is(0);
+                 criteria.and("companyOrgId").in(orgIds);
+                 criteria.and("deptOrgId").is(0);
              }
          }
      }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReplaceController.java

@@ -61,7 +61,6 @@ public class MeterReplaceController  extends BaseController {
         }
     }
 
-
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     @ApiOperation(value = "换表")
     public AjaxMessage submitWaterMeterReplace(@RequestBody @Valid WaterMeterReplaceInputDto waterMeterReplaceInputDto) {