Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-06-28 d48878d3ddbf89c72e361bae7eb5c0e9ff96f9aa

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -224,7 +224,6 @@
      ge.deleted = 0
      AND divi.deleted = 0
      and blo.deleted = 0
      and cont.deleted = 0
      <if test="intakeName != null and intakeName != ''">
        AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
      </if>
@@ -284,7 +283,6 @@
      ge.deleted = 0
      AND divi.deleted = 0
      and blo.deleted = 0
      and cont.deleted = 0
      <if test="intakeName != null and intakeName != ''">
        AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
      </if>

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java

@@ -132,13 +132,13 @@
    }

    /**
     * 根据控制器编号逻辑删除控制
     * 根据控制器编号物理删除控制
     *
     * @param controllerId
     * @return
     */
    public Integer deleteControllerById(Long controllerId) {
        return prControllerMapper.deleteControllerById(controllerId);
        return prControllerMapper.deleteByPrimaryKey(controllerId);
    }

    /**