Browse Source

1、增加用户删除方法
2、用户编辑新增手机号非必填
3、修复用户新增或者编辑部门选中无效bug

hanzhen 3 years ago
parent
commit
4e46982281

+ 1 - 1
src/main/java/com/gz/controller/system/AdminController.java

@@ -43,7 +43,7 @@ public class AdminController {
 
 
     @DeleteMapping("delete")
     @DeleteMapping("delete")
     @TraceLog(module = "管理员管理",business = "删除管理员")
     @TraceLog(module = "管理员管理",business = "删除管理员")
-    public Integer delete( Integer id){
+    public Integer delete(String id){
         return adminService.delete(id);
         return adminService.delete(id);
     }
     }
 
 

+ 8 - 0
src/main/java/com/gz/mapper/system/AdminMapper.java

@@ -3,6 +3,7 @@ package com.gz.mapper.system;
 import com.gz.dto.system.AdminDTO;
 import com.gz.dto.system.AdminDTO;
 import com.gz.rvo.system.AdminRVO;
 import com.gz.rvo.system.AdminRVO;
 import com.gz.vo.system.AdminVO;
 import com.gz.vo.system.AdminVO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 import tk.mybatis.mapper.common.Mapper;
 
 
 import java.util.List;
 import java.util.List;
@@ -16,4 +17,11 @@ public interface AdminMapper extends Mapper<AdminDTO> {
     AdminRVO selectByPrimaryKeyDept(String id);
     AdminRVO selectByPrimaryKeyDept(String id);
 
 
     List<AdminDTO> selectByPage(AdminVO vo);
     List<AdminDTO> selectByPage(AdminVO vo);
+
+    /**
+     * 删除用户
+     * @param id
+     * @return
+     */
+    int deleteById(@Param("id") String id);
 }
 }

+ 1 - 1
src/main/java/com/gz/service/system/AdminService.java

@@ -22,7 +22,7 @@ public interface AdminService {
      * @author LiuChangLan
      * @author LiuChangLan
      * @since 2020/9/4 14:46
      * @since 2020/9/4 14:46
      */
      */
-    Integer delete(Integer id);
+    Integer delete(String id);
 
 
     /**
     /**
      * @description 改
      * @description 改

+ 2 - 2
src/main/java/com/gz/service/system/impl/AdminServiceImpl.java

@@ -51,8 +51,8 @@ public class AdminServiceImpl implements AdminService {
     }
     }
 
 
     @Override
     @Override
-    public Integer delete(Integer id) {
-        return adminMapper.deleteByPrimaryKey(id);
+    public Integer delete(String id) {
+        return adminMapper.deleteById(id);
     }
     }
 
 
     @Override
     @Override

+ 4 - 0
src/main/resources/mapper/adminMapper.xml

@@ -32,4 +32,8 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <delete id="deleteById" parameterType="java.lang.String">
+        delete from tab_admin where id = #{id}
+    </delete>
 </mapper>
 </mapper>

+ 6 - 9
src/main/resources/static/page/admin/edit.html

@@ -45,9 +45,9 @@
 
 
 
 
     <div class="layui-form-item">
     <div class="layui-form-item">
-        <label class="layui-form-label required">手机号</label>
+        <label class="layui-form-label">手机号</label>
         <div class="layui-input-block">
         <div class="layui-input-block">
-            <input type="text" name="phone" lay-verify="phone" lay-reqtext="手机号不能为空" placeholder="请输入手机号"
+            <input type="text" name="phone" placeholder="请输入手机号"
                    value="" class="layui-input">
                    value="" class="layui-input">
         </div>
         </div>
     </div>
     </div>
@@ -104,9 +104,7 @@
         let deptId = ''
         let deptId = ''
         // url参数
         // url参数
         const urlParam = layui.url()
         const urlParam = layui.url()
-        console.log('urlParam.id',urlParam.id);
         /**方-------------------------------法-------------------------------定-------------------------------义*/
         /**方-------------------------------法-------------------------------定-------------------------------义*/
-
             //保存方法
             //保存方法
         let save = function (data) {
         let save = function (data) {
                 http.post('system/admin/addOrUpdate', data, true, function (res) {
                 http.post('system/admin/addOrUpdate', data, true, function (res) {
@@ -145,12 +143,11 @@
                         enable: true
                         enable: true
                     }
                     }
                 },
                 },
+                click: function (d) {
+                    $("#deptId").val(d.current.id);
+                },
                 success: function (res) {
                 success: function (res) {
-                    if (deptId != null) {
-                        if (urlParam.id != '' && deptId != '') {
-                            treeSelect.checkNode('deptId', deptId);
-                        }
-                    }
+                    treeSelect.checkNode('deptId', deptId);
                 }
                 }
             });
             });
         }
         }