Merge branch 'feature/yujt_P2' of http://121.42.41.42:7070/r/epdc-cloud-property-yushan into feature/yujt_P2

epdc-cloud-property/src/main/resources/mapper/project/PropertyDao.xml

@@ -3,18 +3,6 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.project.dao.PropertyDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.project.entity.PropertyEntity" id="propertyMap">
-        <result property="id" column="ID"/>
-        <result property="propertyName" column="PROPERTY_NAME"/>
-        <result property="propertyCode" column="PROPERTY_CODE"/>
-        <result property="effectiveFlag" column="EFFECTIVE_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <sql id="Base_Column_List">
         ID,	PROPERTY_NAME,	PROPERTY_CODE,	EFFECTIVE_FLAG,	REVISION,	DEL_FLAG,	CREATED_BY,	CREATED_TIME,
 	UPDATED_BY,	UPDATED_TIME
@@ -42,7 +30,7 @@
         FROM
         epdc_property ep
         WHERE
-        ep.DEL_FLAG = '0'
+        ep.DEL_FLAG = '0' and effective_Flag = '1'
         ORDER BY
         ep.CREATED_TIME DESC
     </select>