Commit 3856da1e authored by ZWT's avatar ZWT

得到的

parent dde9bc7d
......@@ -70,7 +70,8 @@
T.ID
</select>
<select id="selectSysAreaPath" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
<select id="selectSysAreaPath" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap"
databaseId="MySQL">
SELECT CONCAT(B.`NAME`, '/', C.`NAME`) AS `NAME`
FROM SYS_AREA B
JOIN SYS_AREA C ON B.ID = C.PARENT_ID
......@@ -79,6 +80,19 @@
AND (B.ID = #{id} OR C.ID = #{id}) LIMIT 1
</select>
<select id="selectSysAreaPath" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap"
databaseId="Oracle">
SELECT *
FROM (SELECT B.NAME || '/' || C.NAME AS NAME
FROM SYS_AREA B
JOIN SYS_AREA C ON B.ID = C.PARENT_ID
WHERE B.LEV = 1
AND C.LEV = 2
AND (B.ID = #{id} OR C.ID = #{id})
ORDER BY C.ID)
WHERE ROWNUM = 1
</select>
<resultMap id="ExtResultMap" type="pps.core.system.entity.SysAreaView" extends="BaseResultMap">
<result column="PROVINCE" property="province"/>
<result column="CITY" property="city"/>
......
......@@ -41,7 +41,7 @@ public class BaseEnergyStorageCloudServiceImpl implements IBaseEnergyStorageClou
List<BaseEnergyStorageDeviceEnt> list = mapper.selectList(new LambdaQueryWrapper<BaseEnergyStorageDeviceEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(CharSequenceUtil.isNotBlank(ouId), BaseEnergyStorageDeviceEnt::getOuId, ouId)
.in(CollUtil.isNotEmpty(ouIds), BaseEnergyStorageDeviceEnt::getOuId, ouId)
.in(CollUtil.isNotEmpty(ouIds), BaseEnergyStorageDeviceEnt::getOuId, ouIds)
);
return XListResult.success(XCopyUtils.copyNewList(list, DynamicQueryBaseEnergyStorageDeviceOutput.class));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment