fix

zhanzhiqin

2022-04-13 0143b00ead241cc2b894745eff9d8ed5493b0b68

fix

 dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java

@@ -15,7 +15,7 @@
    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);


    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState, Long userid);
    List<MonitorBo> listMonitorByIds(String keyword, int bindingState, int equipmentState, Long userid);

    List<String> listMonitorDeviceSerial();
}

 dao/src/main/resources/mapper/MonitorMapper.xml

@@ -62,9 +62,6 @@
                OR t1.note LIKE CONCAT(CONCAT('%', #{keyword}), '%')
                OR t3.pole_code LIKE CONCAT(CONCAT('%', #{keyword}), '%')
            </if>
            <if test="clientId != null">
                AND t3.client_id = #{clientId}
            </if>
            <if test="bindingState != 2">
                AND t1.binding_state = #{bindingState}
            </if>

 dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml

@@ -41,7 +41,7 @@
                AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
            </if>
            <if test="clientId != null">
                AND t3.client_id = #{clientId}
                AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
            </if>
        </where>
    </select>

 ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java

@@ -82,7 +82,7 @@
        if (loginUserInfo == null) {
            return null;
        }
        if (AdministratorEnums.CUSTOMER.getCode().equals(loginUserInfo.getAdministratorType())) {
        if (!AdministratorEnums.ADMIN.getCode().equals(loginUserInfo.getAdministratorType())) {
            return loginUserInfo.getUserId();
        }
        return null;

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java

@@ -55,7 +55,6 @@
     * 模糊查询
     */
    public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<MonitorBo> monitorList;
        //绑定状态：已绑定/未绑定/全部
@@ -71,10 +70,10 @@

        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
        }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java

@@ -38,10 +38,15 @@
     * 模糊查询
     */
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        Long userId = SecurityUtils.getUserId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
        List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
        } else {
            waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
        }
        return waterQualityEquipmentBoList;
    }