deptid改成驼峰

286004f7 · fengshuonan · 765f30da · 286004f7 · 286004f7 · 286004f7
Commit 286004f7 authored Dec 08, 2018 by fengshuonan
13 changed files
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
@@ -31,7 +31,7 @@ public class RoleDict extends AbstractDictMap {
        put("num", "角色排序");
        put("pid", "角色的父级");
        put("name", "角色名称");
-        put("deptid", "部门名称");
+        put("deptId", "部门名称");
        put("tips", "备注");
        put("ids", "资源名称");
    }
@@ -39,7 +39,7 @@ public class RoleDict extends AbstractDictMap {
    @Override
    protected void initBeWrapped() {
        putFieldWrapperMethodName("pid", "getSingleRoleName");
-        putFieldWrapperMethodName("deptid", "getDeptName");
+        putFieldWrapperMethodName("deptId", "getDeptName");
        putFieldWrapperMethodName("roleId", "getSingleRoleName");
        putFieldWrapperMethodName("ids", "getMenuNames");
    }

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java
@@ -36,14 +36,14 @@ public class UserDict extends AbstractDictMap {
        put("email", "电子邮件");
        put("phone", "电话");
        put("roleid", "角色名称");
-        put("deptid", "部门名称");
+        put("deptId", "部门名称");
        put("roleIds", "角色名称集合");
    }
    @Override
    protected void initBeWrapped() {
        putFieldWrapperMethodName("sex", "getSexName");
-        putFieldWrapperMethodName("deptid", "getDeptName");
+        putFieldWrapperMethodName("deptId", "getDeptName");
        putFieldWrapperMethodName("roleid", "getSingleRoleName");
        putFieldWrapperMethodName("userId", "getUserAccountById");
        putFieldWrapperMethodName("roleIds", "getRoleName");

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
@@ -316,9 +316,9 @@ public class ConstantFactory implements IConstantFactory {
     * 获取子部门id
     */
    @Override
-    public List<Long> getSubDeptId(Long deptid) {
+    public List<Long> getSubDeptId(Long deptId) {
        Wrapper<Dept> wrapper = new EntityWrapper<>();
-        wrapper = wrapper.like("PIDS", "%[" + deptid + "]%");
+        wrapper = wrapper.like("PIDS", "%[" + deptId + "]%");
        List<Dept> depts = this.deptMapper.selectList(wrapper);
        ArrayList<Long> deptids = new ArrayList<>();
@@ -336,8 +336,8 @@ public class ConstantFactory implements IConstantFactory {
     * 获取所有父部门id
     */
    @Override
-    public List<Long> getParentDeptIds(Long deptid) {
+    public List<Long> getParentDeptIds(Long deptId) {
-        Dept dept = deptMapper.selectById(deptid);
+        Dept dept = deptMapper.selectById(deptId);
        String pids = dept.getPids();
        String[] split = pids.split(",");
        ArrayList<Long> parentDeptIds = new ArrayList<>();

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/factory/IConstantFactory.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/factory/IConstantFactory.java
@@ -121,11 +121,11 @@ public interface IConstantFactory {
    /**
     * 获取子部门id
     */
-    List<Long> getSubDeptId(Long deptid);
+    List<Long> getSubDeptId(Long deptId);
    /**
     * 获取所有父部门id
     */
-    List<Long> getParentDeptIds(Long deptid);
+    List<Long> getParentDeptIds(Long deptId);
 }
--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
@@ -193,7 +193,7 @@ public class UserMgrController extends BaseController {
    @ResponseBody
    public Object list(@RequestParam(required = false) String name,
                       @RequestParam(required = false) String timeLimit,
-                       @RequestParam(required = false) Long deptid) {
+                       @RequestParam(required = false) Long deptId) {
        //拼接查询条件
        String beginTime = "";
@@ -206,11 +206,11 @@ public class UserMgrController extends BaseController {
        }
        if (ShiroKit.isAdmin()) {
-            List<Map<String, Object>> users = userService.selectUsers(null, name, beginTime, endTime, deptid);
+            List<Map<String, Object>> users = userService.selectUsers(null, name, beginTime, endTime, deptId);
            return new UserWarpper(users).wrap();
        } else {
            DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
-            List<Map<String, Object>> users = userService.selectUsers(dataScope, name, beginTime, endTime, deptid);
+            List<Map<String, Object>> users = userService.selectUsers(dataScope, name, beginTime, endTime, deptId);
            return new UserWarpper(users).wrap();
        }
    }
@@ -403,8 +403,8 @@ public class UserMgrController extends BaseController {
        }
        List<Long> deptDataScope = ShiroKit.getDeptDataScope();
        User user = this.userService.selectById(userId);
-        Long deptid = user.getDeptId();
+        Long deptId = user.getDeptId();
-        if (deptDataScope.contains(deptid)) {
+        if (deptDataScope.contains(deptId)) {
            return;
        } else {
            throw new ServiceException(BizExceptionEnum.NO_PERMITION);

--- a/src/main/java/cn/stylefeng/guns/modular/system/mapper/UserMapper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/mapper/UserMapper.java
@@ -31,7 +31,7 @@ public interface UserMapper extends BaseMapper<User> {
    /**
     * 根据条件查询用户列表
     */
-    List<Map<String, Object>> selectUsers(@Param("dataScope") DataScope dataScope, @Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptId);
+    List<Map<String, Object>> selectUsers(@Param("dataScope") DataScope dataScope, @Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptId") Long deptId);
    /**
     * 设置用户的角色

--- a/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/UserMapper.xml
+++ b/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/UserMapper.xml
@@ -49,8 +49,8 @@
            or ACCOUNT like CONCAT('%',#{name},'%')
            or NAME like CONCAT('%',#{name},'%'))
        </if>
-        <if test="deptid != null and deptid != 0">
+        <if test="deptId != null and deptId != 0">
-            and (DEPT_ID = #{deptid} or DEPT_ID in ( select DEPT_ID from sys_dept where PIDS like CONCAT('%[', #{deptid}, ']%') ))
+            and (DEPT_ID = #{deptId} or DEPT_ID in ( select DEPT_ID from sys_dept where PIDS like CONCAT('%[', #{deptId}, ']%') ))
        </if>
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            and (CREATE_TIME between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))

--- a/src/main/webapp/WEB-INF/system/role/role_add.html
+++ b/src/main/webapp/WEB-INF/system/role/role_add.html
@@ -19,7 +19,7 @@
                <div class="form-group">
                    <h5>别名 <span class="text-danger">*</span></h5>
                    <div class="controls">
-                        <input v-model="tips" type="text" class="form-control">
+                        <input v-model="description" type="text" class="form-control">
                    </div>
                </div>
            </div>
@@ -28,7 +28,7 @@
                    <h5>部门名称 <span class="text-danger">*</span></h5>
                    <div class="controls">
                        <input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off">
-                        <input v-model="deptid" type="hidden" class="form-control">
+                        <input v-model="deptId" type="hidden" class="form-control">
                    </div>
                </div>
                <div class="form-group">

--- a/src/main/webapp/WEB-INF/system/role/role_edit.html
+++ b/src/main/webapp/WEB-INF/system/role/role_edit.html
@@ -28,7 +28,7 @@
                    <h5>部门名称 <span class="text-danger">*</span></h5>
                    <div class="controls">
                        <input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off">
-                        <input v-model="deptid" type="hidden" class="form-control">
+                        <input v-model="deptId" type="hidden" class="form-control">
                    </div>
                </div>
                <div class="form-group">

--- a/src/main/webapp/assets/modular/system/role/role.js
+++ b/src/main/webapp/assets/modular/system/role/role.js
@@ -17,11 +17,10 @@ var Role = {
 Role.initColumn = function () {
    return [
        {field: 'selectItem', radio: true},
-        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: 'id', field: 'roleId', visible: false, align: 'center', valign: 'middle'},
        {title: '名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
-        {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+        {title: '别名', field: 'description', align: 'center', valign: 'middle', sortable: true}];
-        {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
 };
@@ -64,7 +63,7 @@ Role.openChangeRole = function () {
            area: ['800px', '400px'], //宽高
            fix: false, //不固定
            maxmin: true,
-            content: Feng.ctxPath + '/role/role_edit?roleId=' + this.seItem.id
+            content: Feng.ctxPath + '/role/role_edit?roleId=' + this.seItem.roleId
        });
    }
 };
@@ -82,7 +81,7 @@ Role.delRole = function () {
            }, function (data) {
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });
-            ajax.set("roleId", Role.seItem.id);
+            ajax.set("roleId", Role.seItem.roleId);
            ajax.start();
        };
@@ -101,7 +100,7 @@ Role.assign = function () {
            area: ['300px', '450px'], //宽高
            fix: false, //不固定
            maxmin: true,
-            content: Feng.ctxPath + '/role/role_assign/' + this.seItem.id
+            content: Feng.ctxPath + '/role/role_assign/' + this.seItem.roleId
        });
    }
 };

--- a/src/main/webapp/assets/modular/system/role/role_add.js
+++ b/src/main/webapp/assets/modular/system/role/role_add.js
@@ -8,7 +8,7 @@ var RoleAddDlg = {
        pid: "",
        tips: "",
        deptName: "",
-        deptid: "",
+        deptId: "",
        num: ""
    }
 };
@@ -69,7 +69,7 @@ $(function () {
            },
            showDeptSelectTree: function () {
                var formName = encodeURIComponent("parent.RoleAddDlg.app.deptName");
-                var formId = encodeURIComponent("parent.RoleAddDlg.app.deptid");
+                var formId = encodeURIComponent("parent.RoleAddDlg.app.deptId");
                var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree");
                layer.open({

--- a/src/main/webapp/assets/modular/system/role/role_edit.js
+++ b/src/main/webapp/assets/modular/system/role/role_edit.js
@@ -9,7 +9,7 @@ var RoleEditDlg = {
        pid: "",
        tips: "",
        deptName: "",
-        deptid: "",
+        deptId: "",
        num: ""
    }
 };
@@ -75,7 +75,7 @@ $(function () {
            },
            showDeptSelectTree: function () {
                var formName = encodeURIComponent("parent.RoleEditDlg.app.deptName");
-                var formId = encodeURIComponent("parent.RoleEditDlg.app.deptid");
+                var formId = encodeURIComponent("parent.RoleEditDlg.app.deptId");
                var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree");
                layer.open({

--- a/src/main/webapp/assets/modular/system/user/user.js
+++ b/src/main/webapp/assets/modular/system/user/user.js
@@ -264,7 +264,7 @@ MgrUser.resetPwdById = function (userId) {
 MgrUser.search = function () {
    var queryData = {};
-    queryData['deptid'] = MgrUser.condition.deptId;
+    queryData['deptId'] = MgrUser.condition.deptId;
    queryData['name'] = MgrUser.condition.name;
    queryData['timeLimit'] = $("#timeLimit").val();