Skip to content

G
guns-vip
Commit 432b37f6 by fengshuonan
Options

修复查询职务兼容oracle

parent 4fabc2b0
Showing with 47 additions and 34 deletions
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/mapper/PositionMapper.java
...@@ -21,6 +21,14 @@ import java.util.Map; ...@@ -21,6 +21,14 @@ import java.util.Map;
public interface PositionMapper extends BaseMapper<Position> { public interface PositionMapper extends BaseMapper<Position> {
/** /**
* 获取map列表
*
* @author stylefeng
* @Date 2019-06-27
*/
List<Map<String, Object>> getAllPositionMap();
/**
* 获取列表 * 获取列表
* *
* @author stylefeng * @author stylefeng
......
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/mapper/mapping/PositionMapper.xml
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.sys.modular.system.entity.Position"> <resultMap id="BaseResultMap" type="cn.stylefeng.guns.sys.modular.system.entity.Position">
<id column="position_id" property="positionId" /> <id column="position_id" property="positionId"/>
<result column="name" property="name" /> <result column="name" property="name"/>
<result column="code" property="code" /> <result column="code" property="code"/>
<result column="sort" property="sort" /> <result column="sort" property="sort"/>
<result column="status" property="status" /> <result column="status" property="status"/>
<result column="remark" property="remark" /> <result column="remark" property="remark"/>
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser" /> <result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime" /> <result column="update_time" property="updateTime"/>
<result column="create_user" property="createUser" /> <result column="create_user" property="createUser"/>
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
...@@ -21,17 +21,22 @@ ...@@ -21,17 +21,22 @@
position_id AS "positionId", name AS "name", code AS "code", sort AS "sort", status AS "status", remark AS "remark", create_time AS "createTime", update_user AS "updateUser", update_time AS "updateTime", create_user AS "createUser" position_id AS "positionId", name AS "name", code AS "code", sort AS "sort", status AS "status", remark AS "remark", create_time AS "createTime", update_user AS "updateUser", update_time AS "updateTime", create_user AS "createUser"
</sql> </sql>
<select id="getAllPositionMap" resultType="java.util.Map">
select
position_id AS "positionId", name AS "name"
from sys_position
</select>
<select id="customList" resultType="cn.stylefeng.guns.sys.modular.system.model.result.PositionResult" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.PositionParam"> <select id="customList" resultType="cn.stylefeng.guns.sys.modular.system.model.result.PositionResult" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.PositionParam">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from sys_position where 1 = 1 from sys_position where 1 = 1
<if test="paramCondition.name != null and paramCondition.name != ''"> <if test="paramCondition.name != null and paramCondition.name != ''">
and name like CONCAT('%',#{paramCondition.name},'%') and name like CONCAT('%',#{paramCondition.name},'%')
</if> </if>
<if test="paramCondition.code != null and paramCondition.code != ''"> <if test="paramCondition.code != null and paramCondition.code != ''">
and code like CONCAT('%',#{paramCondition.code},'%') and code like CONCAT('%',#{paramCondition.code},'%')
</if> </if>
order by sort asc order by sort asc
</select> </select>
...@@ -39,12 +44,12 @@ ...@@ -39,12 +44,12 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from sys_position where 1 = 1 from sys_position where 1 = 1
<if test="paramCondition.name != null and paramCondition.name != ''"> <if test="paramCondition.name != null and paramCondition.name != ''">
and name like CONCAT('%',#{paramCondition.name},'%') and name like CONCAT('%',#{paramCondition.name},'%')
</if> </if>
<if test="paramCondition.code != null and paramCondition.code != ''"> <if test="paramCondition.code != null and paramCondition.code != ''">
and code like CONCAT('%',#{paramCondition.code},'%') and code like CONCAT('%',#{paramCondition.code},'%')
</if> </if>
order by sort asc order by sort asc
</select> </select>
...@@ -67,12 +72,12 @@ ...@@ -67,12 +72,12 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from sys_position where 1 = 1 from sys_position where 1 = 1
<if test="paramCondition.name != null and paramCondition.name != ''"> <if test="paramCondition.name != null and paramCondition.name != ''">
and name like CONCAT('%',#{paramCondition.name},'%') and name like CONCAT('%',#{paramCondition.name},'%')
</if> </if>
<if test="paramCondition.code != null and paramCondition.code != ''"> <if test="paramCondition.code != null and paramCondition.code != ''">
and code like CONCAT('%',#{paramCondition.code},'%') and code like CONCAT('%',#{paramCondition.code},'%')
</if> </if>
order by sort asc order by sort asc
</select> </select>
......
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/impl/PositionServiceImpl.java
...@@ -75,9 +75,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i ...@@ -75,9 +75,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
public LayuiPageInfo listPositions(Long userId) { public LayuiPageInfo listPositions(Long userId) {
//找出所有职位 //找出所有职位
QueryWrapper<Position> objectQueryWrapper = new QueryWrapper<>(); List<Map<String, Object>> list = this.baseMapper.getAllPositionMap();
objectQueryWrapper.select("position_id", "name");
List<Map<String, Object>> list = this.listMaps(objectQueryWrapper);
//用户id为空，则直接返回 //用户id为空，则直接返回
if (userId == null) { if (userId == null) {
...@@ -90,7 +88,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i ...@@ -90,7 +88,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
if (userPosList != null && userPosList.size() > 0) { if (userPosList != null && userPosList.size() > 0) {
for (UserPos userPos : userPosList) { for (UserPos userPos : userPosList) {
for (Map<String, Object> positionMap : list) { for (Map<String, Object> positionMap : list) {
if (userPos.getPosId().equals(positionMap.get("position_id"))) { if (userPos.getPosId().equals(positionMap.get("positionId"))) {
positionMap.put("selected", true); positionMap.put("selected", true);
} }
} }
......
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/user/user_add.js
...@@ -76,6 +76,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function ( ...@@ -76,6 +76,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function (
formSelects.config('selPosition', { formSelects.config('selPosition', {
searchUrl: Feng.ctxPath + "/position/listPositions", searchUrl: Feng.ctxPath + "/position/listPositions",
keyName: 'name', keyName: 'name',
keyVal: 'position_id' keyVal: 'positionId'
}); });
}); });
\ No newline at end of file
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/user/user_edit.js
...@@ -82,6 +82,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function ( ...@@ -82,6 +82,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function (
formSelects.config('selPosition', { formSelects.config('selPosition', {
searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(), searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(),
keyName: 'name', keyName: 'name',
keyVal: 'position_id' keyVal: 'positionId'
}); });
}); });
\ No newline at end of file
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