#

Junjie

3 天以前 7e277af67efbba9690fcc33525b92d3eb5f3cac9

#

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -446,6 +446,9 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            if(Cools.isEmpty(user.getNickname())){
                return String.valueOf(user.getUsername());
            }
            return String.valueOf(user.getNickname());
        }
        return null;

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -463,6 +463,9 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            if(Cools.isEmpty(user.getNickname())){
                return String.valueOf(user.getUsername());
            }
            return String.valueOf(user.getNickname());
        }
        return null;

 src/main/java/com/zy/system/controller/UserController.java

@@ -120,6 +120,9 @@
        if(user.getRoleId() != null) {
            entity.setRoleId(user.getRoleId());
        }
        if(user.getNickname()!=null) {
            entity.setNickname(user.getNickname());
        }
        userService.updateById(entity);
        return R.ok();
    }

 src/main/webapp/static/js/user/user.js

@@ -24,7 +24,7 @@
        cols: [[
            {type: 'checkbox'}
            // ,{field: 'hostName', align: 'center',title: '授权商户', templet: '#hostTpl', width: 140}
            // ,{field: 'nickname', align: 'center',title: '用户名'}
            ,{field: 'nickname', align: 'center',title: '用户名'}
            ,{field: 'username', align: 'center',title: '登录账户'}
            ,{field: 'mobile', align: 'center',title: '手机号'}
            // ,{field: 'deptName', align: 'center',title: '所属部门'}

 src/main/webapp/views/user/user.html

@@ -136,6 +136,12 @@
                        <input name="email" placeholder="请输入邮箱" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">名称</label>
                    <div class="layui-input-block">
                        <input name="nickname" placeholder="请输入名称" class="layui-input">
                    </div>
                </div>

            </div>
        </div>