修复查询职务兼容oracle

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;
 public interface PositionMapper extends BaseMapper<Position> {
 
     /**
+     * 获取map列表
+     *
+     * @author stylefeng
+     * @Date 2019-06-27
+     */
+    List<Map<String, Object>> getAllPositionMap();
+
+    /**
      * 获取列表
      *
      * @author stylefeng

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/mapper/mapping/PositionMapper.xml

@@ -4,16 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.stylefeng.guns.sys.modular.system.entity.Position">
-        <id column="position_id" property="positionId" />
-        <result column="name" property="name" />
-        <result column="code" property="code" />
-        <result column="sort" property="sort" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_user" property="updateUser" />
-        <result column="update_time" property="updateTime" />
-        <result column="create_user" property="createUser" />
+        <id column="position_id" property="positionId"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="sort" property="sort"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -21,6 +21,11 @@
         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>
 
+    <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

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
     public LayuiPageInfo listPositions(Long userId) {
 
         //找出所有职位
-        QueryWrapper<Position> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.select("position_id", "name");
-        List<Map<String, Object>> list = this.listMaps(objectQueryWrapper);
+        List<Map<String, Object>> list = this.baseMapper.getAllPositionMap();
 
         //用户id为空，则直接返回
         if (userId == null) {
@@ -90,7 +88,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
             if (userPosList != null && userPosList.size() > 0) {
                 for (UserPos userPos : userPosList) {
                     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);
                         }
                     }

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 (
     formSelects.config('selPosition', {
         searchUrl: Feng.ctxPath + "/position/listPositions",
         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 (
     formSelects.config('selPosition', {
         searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(),
         keyName: 'name',
-        keyVal: 'position_id'
+        keyVal: 'positionId'
     });
 });
\ No newline at end of file