From 1b7ed4f52caf22e09a2c9a6e9d5682e06d841096 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 14 Apr 2025 15:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98bug=E8=A7=A3=E5=86=B3=E5=92=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E7=99=BB=E5=BD=95=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 4 +-- .../system/service/impl/UserServiceImpl.java | 2 +- .../resources/mappers/system/UserMapper.xml | 6 ++-- .../static/js/system/child/userFormTemp.js | 31 ++++++++++--------- .../static/pages/user/child/userFormTemp.html | 4 +-- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/system/controller/UserController.java b/src/main/java/com/bonus/imgTool/system/controller/UserController.java index 4777961..4b59f76 100644 --- a/src/main/java/com/bonus/imgTool/system/controller/UserController.java +++ b/src/main/java/com/bonus/imgTool/system/controller/UserController.java @@ -226,7 +226,7 @@ public class UserController { UserDto userDto = userService.getById(data.getData().getId()); List projects = userService.getProjects(userDto); userDto.setProjects(projects); - /*String loginType = userDto.getLoginType(); + String loginType = userDto.getLoginType(); if (loginType != null && !loginType.isEmpty()){ String[] loginTypeArr = loginType.split(","); List loginTypes = new ArrayList<>(); @@ -234,7 +234,7 @@ public class UserController { loginTypes.add(Long.parseLong(type.trim())); } userDto.setLoginTypes(loginTypes); - }*/ + } return ServerResponse.createSuccess(userDto); }catch (Exception e){ log.error(e.toString(),e); diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java index 9c10ccd..b92c922 100644 --- a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java @@ -53,7 +53,7 @@ public class UserServiceImpl implements UserService { if (StringUtils.isNotBlank(project)){ for (String proId : project.split(",")) { // 新增工程 - userDao.saveUserProject(userDto.getId(), proId); + userDao.saveUserProject(user.getId(), proId); } } if (num > 0) { diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index d17c92d..61f0383 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -52,12 +52,12 @@ - + insert into sys_user(login_name, user_name, user_code, - sex, org_id,login_type, role_id, phone, user_type, state, + sex, org_id,login_type, role_id, user_type, state, password, team_id, @@ -67,7 +67,7 @@ #{userCode}, - #{sex}, #{orgId},#{loginType}, #{roleId}, #{phone}, #{userType}, + #{sex}, #{orgId},#{loginType}, #{roleId}, #{userType}, #{state}, #{password}, diff --git a/src/main/resources/static/js/system/child/userFormTemp.js b/src/main/resources/static/js/system/child/userFormTemp.js index 122513b..9bf4fb1 100644 --- a/src/main/resources/static/js/system/child/userFormTemp.js +++ b/src/main/resources/static/js/system/child/userFormTemp.js @@ -43,7 +43,7 @@ function setParams(params) { let loginName = $('#loginName').val(); if (loginName) { if (!(/^1[3456789]\d{9}$/.test(loginName))) { - return layer.alert("请输入正确的手机号", {icon: 2}) + return layer.alert("登录账号请输入正确的手机号", {icon: 2}) } } if (!validatePassword(data.field.password)) { @@ -287,15 +287,16 @@ function setFormData(data) { formSelects.value('project', selectedValues); /*$('#teamId').val(data.teamId) $('#teamId option[value=' + data.teamId + ']').attr('selected', true)*/ - // var arrCB = data.loginTypes; - // for (var j = 0; j < arrCB.length; j++) { - // var cbthis = $("input[name='loginType']"); - // for (var i = 0; i < cbthis.length; i++) { - // if (cbthis[i].value == arrCB[j]) { - // cbthis[i].checked = true; - // } - // } - // } + var arrCB = data.loginTypes; + console.log(arrCB+"arrCB"); + for (var j = 0; j < arrCB.length; j++) { + var cbthis = $("input[name='loginType']"); + for (var i = 0; i < cbthis.length; i++) { + if (cbthis[i].value == arrCB[j]) { + cbthis[i].checked = true; + } + } + } layui.form.render(); } } @@ -309,16 +310,16 @@ function saveData(data) { let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); let url = dataUrl + "/users/addTemp"; let params = data.field; - // var arr_box = [];//固定复选框 - // $('#cbGuDing input[type=checkbox]:checked').each(function () { - // arr_box.push($(this).val()); - // }); + var arr_box = [];//固定复选框 + $('#cbGuDing input[type=checkbox]:checked').each(function () { + arr_box.push($(this).val()); + }); // var arr_pro = [];//固定复选框 // $('#project input[type=checkbox]:checked').each(function () { // arr_pro.push($(this).val()); // }); - // params.loginType = arr_box.join() + params.loginType = arr_box.join() // params.project = arr_pro.join() // params.orgId = params.orgId_select_nodeId; if (params.id != "") { diff --git a/src/main/resources/static/pages/user/child/userFormTemp.html b/src/main/resources/static/pages/user/child/userFormTemp.html index c32cd71..d468126 100644 --- a/src/main/resources/static/pages/user/child/userFormTemp.html +++ b/src/main/resources/static/pages/user/child/userFormTemp.html @@ -115,7 +115,7 @@ --> - +