修改问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -124,8 +124,9 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
         param.setOrderBy("checkDate desc");
-        param.setBizOrgCode("3".equals(param.getIsOK()) ? null :
-                ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
+        param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ?
+                "3".equals(param.getIsOK()) ? null : reginParams.getPersonIdentity().getBizOrgCode()
+                : param.getBizOrgCode());
         if(commonPageable !=null){
             param.setPageNumber(commonPageable.getPageNumber()-1);
             param.setPageSize(commonPageable.getPageSize());

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -81,7 +81,7 @@
                 sys.status = #{status}
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                sys.bizOrgCode like concat('%',#{bizOrgCode},'%')
+             and   sys.bizOrgCode like concat('%',#{bizOrgCode},'%')
             </if>
         </where>
     </select>
@@ -132,7 +132,7 @@
                 sys.status = #{status}
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                sys.bizOrgCode like concat('%',#{bizOrgCode},'%')
+              and  sys.bizOrgCode like concat('%',#{bizOrgCode},'%')
             </if>
         </where>
         LIMIT #{current},#{size}