diff --git a/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java b/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java
index 943efbba7422081d9b2c763290d548d26958514e..ce25ea483f203b66208a454ed32701c0e1bb50b0 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java
+++ b/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java
@@ -9,6 +9,10 @@ public class BootdoConfig {
 	//上传路径
 	private String uploadPath;
 
+	private String username;
+
+	private String password;
+
 	public String getUploadPath() {
 		return uploadPath;
 	}
@@ -16,4 +20,20 @@ public class BootdoConfig {
 	public void setUploadPath(String uploadPath) {
 		this.uploadPath = uploadPath;
 	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
 }
diff --git a/bootdo/src/main/java/com/bootdo/system/controller/LoginController.java b/bootdo/src/main/java/com/bootdo/system/controller/LoginController.java
index 4312dfe167d5d87a1cc28d2b39f298e1c45f8eb5..6d6aa5f87aa7e3504b462607fee88c784710d48d 100644
--- a/bootdo/src/main/java/com/bootdo/system/controller/LoginController.java
+++ b/bootdo/src/main/java/com/bootdo/system/controller/LoginController.java
@@ -1,6 +1,7 @@
 package com.bootdo.system.controller;
 
 import com.bootdo.common.annotation.Log;
+import com.bootdo.common.config.BootdoConfig;
 import com.bootdo.common.controller.BaseController;
 import com.bootdo.common.domain.FileDO;
 import com.bootdo.common.domain.Tree;
@@ -28,68 +29,73 @@ import java.util.List;
 
 @Controller
 public class LoginController extends BaseController {
-	private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-	@Autowired
-	MenuService menuService;
-	@Autowired
-	FileService fileService;
-	@GetMapping({ "/", "" })
-	String welcome(Model model) {
+    @Autowired
+    MenuService menuService;
+    @Autowired
+    FileService fileService;
+    @Autowired
+    BootdoConfig bootdoConfig;
 
-		return "redirect:/blog";
-	}
+    @GetMapping({"/", ""})
+    String welcome(Model model) {
 
-	@Log("请求访问主页")
-	@GetMapping({ "/index" })
-	String index(Model model) {
-		List<Tree<MenuDO>> menus = menuService.listMenuTree(getUserId());
-		model.addAttribute("menus", menus);
-		model.addAttribute("name", getUser().getName());
-		FileDO fileDO = fileService.get(getUser().getPicId());
-		if(fileDO!=null&&fileDO.getUrl()!=null){
-			if(fileService.isExist(fileDO.getUrl())){
-				model.addAttribute("picUrl",fileDO.getUrl());
-			}else {
-				model.addAttribute("picUrl","/img/photo_s.jpg");
-			}
-		}else {
-			model.addAttribute("picUrl","/img/photo_s.jpg");
-		}
-		model.addAttribute("username", getUser().getUsername());
-		return "index_v1";
-	}
+        return "redirect:/blog";
+    }
 
-	@GetMapping("/login")
-	String login() {
-		return "login";
-	}
+    @Log("请求访问主页")
+    @GetMapping({"/index"})
+    String index(Model model) {
+        List<Tree<MenuDO>> menus = menuService.listMenuTree(getUserId());
+        model.addAttribute("menus", menus);
+        model.addAttribute("name", getUser().getName());
+        FileDO fileDO = fileService.get(getUser().getPicId());
+        if (fileDO != null && fileDO.getUrl() != null) {
+            if (fileService.isExist(fileDO.getUrl())) {
+                model.addAttribute("picUrl", fileDO.getUrl());
+            } else {
+                model.addAttribute("picUrl", "/img/photo_s.jpg");
+            }
+        } else {
+            model.addAttribute("picUrl", "/img/photo_s.jpg");
+        }
+        model.addAttribute("username", getUser().getUsername());
+        return "index_v1";
+    }
 
-	@Log("登录")
-	@PostMapping("/login")
-	@ResponseBody
-	R ajaxLogin(String username, String password) {
+    @GetMapping("/login")
+    String login(Model model) {
+        model.addAttribute("username", bootdoConfig.getUsername());
+        model.addAttribute("password", bootdoConfig.getPassword());
+        return "login";
+    }
 
-		password = MD5Utils.encrypt(username, password);
-		UsernamePasswordToken token = new UsernamePasswordToken(username, password);
-		Subject subject = SecurityUtils.getSubject();
-		try {
-			subject.login(token);
-			return R.ok();
-		} catch (AuthenticationException e) {
-			return R.error("用户或密码错误");
-		}
-	}
+    @Log("登录")
+    @PostMapping("/login")
+    @ResponseBody
+    R ajaxLogin(String username, String password) {
 
-	@GetMapping("/logout")
-	String logout() {
-		ShiroUtils.logout();
-		return "redirect:/login";
-	}
+        password = MD5Utils.encrypt(username, password);
+        UsernamePasswordToken token = new UsernamePasswordToken(username, password);
+        Subject subject = SecurityUtils.getSubject();
+        try {
+            subject.login(token);
+            return R.ok();
+        } catch (AuthenticationException e) {
+            return R.error("用户或密码错误");
+        }
+    }
 
-	@GetMapping("/main")
-	String main() {
-		return "main";
-	}
+    @GetMapping("/logout")
+    String logout() {
+        ShiroUtils.logout();
+        return "redirect:/login";
+    }
+
+    @GetMapping("/main")
+    String main() {
+        return "main";
+    }
 
 }
diff --git a/bootdo/src/main/java/com/bootdo/system/service/DeptService.java b/bootdo/src/main/java/com/bootdo/system/service/DeptService.java
index 1b3e5417ab20af4a1bf004902a1d403040c167d2..a0125afce92f4064f88d0d7fd3698c9a87c7ced9 100644
--- a/bootdo/src/main/java/com/bootdo/system/service/DeptService.java
+++ b/bootdo/src/main/java/com/bootdo/system/service/DeptService.java
@@ -32,4 +32,6 @@ public interface DeptService {
 	Tree<DeptDO> getTree();
 	
 	boolean checkDeptHasUser(Long deptId);
+
+	List<Long> listChildrenIds(Long parentId);
 }
diff --git a/bootdo/src/main/java/com/bootdo/system/service/impl/DeptServiceImpl.java b/bootdo/src/main/java/com/bootdo/system/service/impl/DeptServiceImpl.java
index 4e29c11e9adf194c07bdabe9d2268a926e3fe537..531f2fb6a0bf2bd4fe6a9569c9d179dfb8b21c66 100644
--- a/bootdo/src/main/java/com/bootdo/system/service/impl/DeptServiceImpl.java
+++ b/bootdo/src/main/java/com/bootdo/system/service/impl/DeptServiceImpl.java
@@ -15,72 +15,90 @@ import com.bootdo.system.domain.DeptDO;
 import com.bootdo.system.service.DeptService;
 
 
-
 @Service
 public class DeptServiceImpl implements DeptService {
-	@Autowired
-	private DeptDao sysDeptMapper;
-
-	@Override
-	public DeptDO get(Long deptId){
-		return sysDeptMapper.get(deptId);
-	}
-
-	@Override
-	public List<DeptDO> list(Map<String, Object> map){
-		return sysDeptMapper.list(map);
-	}
-
-	@Override
-	public int count(Map<String, Object> map){
-		return sysDeptMapper.count(map);
-	}
-
-	@Override
-	public int save(DeptDO sysDept){
-		return sysDeptMapper.save(sysDept);
-	}
-
-	@Override
-	public int update(DeptDO sysDept){
-		return sysDeptMapper.update(sysDept);
-	}
-
-	@Override
-	public int remove(Long deptId){
-		return sysDeptMapper.remove(deptId);
-	}
-
-	@Override
-	public int batchRemove(Long[] deptIds){
-		return sysDeptMapper.batchRemove(deptIds);
-	}
-
-	@Override
-	public Tree<DeptDO> getTree() {
-		List<Tree<DeptDO>> trees = new ArrayList<Tree<DeptDO>>();
-		List<DeptDO> sysDepts = sysDeptMapper.list(new HashMap<String,Object>(16));
-		for (DeptDO sysDept : sysDepts) {
-			Tree<DeptDO> tree = new Tree<DeptDO>();
-			tree.setId(sysDept.getDeptId().toString());
-			tree.setParentId(sysDept.getParentId().toString());
-			tree.setText(sysDept.getName());
-			Map<String, Object> state = new HashMap<>(16);
-			state.put("opened", true);
-			tree.setState(state);
-			trees.add(tree);
-		}
-		// 默认顶级菜单为０，根据数据库实际情况调整
-		Tree<DeptDO> t = BuildTree.build(trees);
-		return t;
-	}
-
-	@Override
-	public boolean checkDeptHasUser(Long deptId) {
-		// TODO Auto-generated method stub
-		//查询部门以及此部门的下级部门
-		int result = sysDeptMapper.getDeptUserNumber(deptId);
-		return result==0?true:false;
-	}
+    @Autowired
+    private DeptDao sysDeptMapper;
+
+    @Override
+    public DeptDO get(Long deptId) {
+        return sysDeptMapper.get(deptId);
+    }
+
+    @Override
+    public List<DeptDO> list(Map<String, Object> map) {
+        return sysDeptMapper.list(map);
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return sysDeptMapper.count(map);
+    }
+
+    @Override
+    public int save(DeptDO sysDept) {
+        return sysDeptMapper.save(sysDept);
+    }
+
+    @Override
+    public int update(DeptDO sysDept) {
+        return sysDeptMapper.update(sysDept);
+    }
+
+    @Override
+    public int remove(Long deptId) {
+        return sysDeptMapper.remove(deptId);
+    }
+
+    @Override
+    public int batchRemove(Long[] deptIds) {
+        return sysDeptMapper.batchRemove(deptIds);
+    }
+
+    @Override
+    public Tree<DeptDO> getTree() {
+        List<Tree<DeptDO>> trees = new ArrayList<Tree<DeptDO>>();
+        List<DeptDO> sysDepts = sysDeptMapper.list(new HashMap<String, Object>(16));
+        for (DeptDO sysDept : sysDepts) {
+            Tree<DeptDO> tree = new Tree<DeptDO>();
+            tree.setId(sysDept.getDeptId().toString());
+            tree.setParentId(sysDept.getParentId().toString());
+            tree.setText(sysDept.getName());
+            Map<String, Object> state = new HashMap<>(16);
+            state.put("opened", true);
+            tree.setState(state);
+            trees.add(tree);
+        }
+        // 默认顶级菜单为０，根据数据库实际情况调整
+        Tree<DeptDO> t = BuildTree.build(trees);
+        return t;
+    }
+
+    @Override
+    public boolean checkDeptHasUser(Long deptId) {
+        // TODO Auto-generated method stub
+        //查询部门以及此部门的下级部门
+        int result = sysDeptMapper.getDeptUserNumber(deptId);
+        return result == 0 ? true : false;
+    }
+
+    @Override
+    public List<Long> listChildrenIds(Long parentId) {
+        List<DeptDO> deptDOS = list(null);
+        return treeMenuList(deptDOS, parentId);
+    }
+
+    List<Long> treeMenuList(List<DeptDO> menuList, long pid) {
+        List<Long> childIds = new ArrayList<>();
+        for (DeptDO mu : menuList) {
+            //遍历出父id等于参数的id，add进子节点集合
+            if (mu.getParentId() == pid) {
+                //递归遍历下一级
+                treeMenuList(menuList, mu.getDeptId());
+                childIds.add(mu.getDeptId());
+            }
+        }
+        return childIds;
+    }
 
 }
diff --git a/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java b/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
index 5864a549ab3a107fd885cbf4dce7ddcfdc2cb8be..e563932513c0bc2bb59cf0c33469b003df4a487b 100644
--- a/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
+++ b/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
@@ -8,6 +8,7 @@ import com.bootdo.common.config.BootdoConfig;
 import com.bootdo.common.domain.FileDO;
 import com.bootdo.common.service.FileService;
 import com.bootdo.common.utils.*;
+import com.bootdo.system.service.DeptService;
 import com.bootdo.system.vo.UserVO;
 import org.apache.commons.lang.ArrayUtils;
 import org.slf4j.Logger;
@@ -44,6 +45,8 @@ public class UserServiceImpl implements UserService {
     private FileService sysFileService;
     @Autowired
     private BootdoConfig bootdoConfig;
+    @Autowired
+    DeptService deptService;
     private static final Logger logger = LoggerFactory.getLogger(UserService.class);
 
     @Override
@@ -58,6 +61,14 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<UserDO> list(Map<String, Object> map) {
+        String deptId = map.get("deptId").toString();
+        if (StringUtils.isNotBlank(deptId)) {
+            Long deptIdl = Long.valueOf(deptId);
+            List<Long> childIds = deptService.listChildrenIds(deptIdl);
+            childIds.add(deptIdl);
+            map.put("deptId", null);
+            map.put("deptIds",childIds);
+        }
         return userMapper.list(map);
     }
 
@@ -105,7 +116,7 @@ public class UserServiceImpl implements UserService {
         return r;
     }
 
-//    @CacheEvict(value = "user")
+    //    @CacheEvict(value = "user")
     @Override
     public int remove(Long userId) {
         userRoleMapper.removeByUserId(userId);
diff --git a/bootdo/src/main/resources/application-dev.yml b/bootdo/src/main/resources/application-dev.yml
index 6b955d073fe4472e00e4d97290946faa125a4e21..74008e77b47de2ed41f7c46ac100dca686deb52a 100644
--- a/bootdo/src/main/resources/application-dev.yml
+++ b/bootdo/src/main/resources/application-dev.yml
@@ -1,5 +1,7 @@
 bootdo:
   uploadPath: c:/var/uploaded_files/
+  username: admin
+  password: 111111
 logging:
   level:
     root: info
diff --git a/bootdo/src/main/resources/application-pro.yml b/bootdo/src/main/resources/application-pro.yml
index 2aa3c9db22938e26547e7f3584f4c0cb699ff810..7ec5088f3bc3c859861f51f249f24e244a9df5c8 100644
--- a/bootdo/src/main/resources/application-pro.yml
+++ b/bootdo/src/main/resources/application-pro.yml
@@ -1,5 +1,7 @@
 bootdo:
   uploadPath: /var/uploaded_files/
+  username: test
+  passward: 111111
 logging:
   level:
     root: error
diff --git a/bootdo/src/main/resources/mybatis/system/UserMapper.xml b/bootdo/src/main/resources/mybatis/system/UserMapper.xml
index 99a0e2a3aa2f5aa4c098d603185ce7e74a180e47..11df002ec173955e487e4866f0d1c12f8f2327e1 100644
--- a/bootdo/src/main/resources/mybatis/system/UserMapper.xml
+++ b/bootdo/src/main/resources/mybatis/system/UserMapper.xml
@@ -3,72 +3,79 @@
 
 <mapper namespace="com.bootdo.system.dao.UserDao">
 
-	<select id="get" resultType="com.bootdo.system.domain.UserDO">
+    <select id="get" resultType="com.bootdo.system.domain.UserDO">
 		select `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district` from sys_user where user_id = #{value}
 	</select>
 
-	<select id="list" resultType="com.bootdo.system.domain.UserDO">
-		select `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district` from sys_user
-        <where>  
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="username != null and username != ''"> and username = #{username} </if>
-		  		  <if test="name != null and name != ''"> and name = #{name} </if>
-		  		  <if test="password != null and password != ''"> and password = #{password} </if>
-		  		  <if test="deptId != null and deptId != ''"> and dept_id = #{deptId} </if>
-		  		  <if test="email != null and email != ''"> and email = #{email} </if>
-		  		  <if test="mobile != null and mobile != ''"> and mobile = #{mobile} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="userIdCreate != null and userIdCreate != ''"> and user_id_create = #{userIdCreate} </if>
-		  		  <if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-		  		  <if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		  		  <if test="sex != null and sex != ''"> and sex = #{sex} </if>
-		  		  <if test="birth != null and birth != ''"> and birth = #{birth} </if>
-		  		  <if test="picId != null and picId != ''"> and pic_id = #{picId} </if>
-		  		  <if test="liveAddress != null and liveAddress != ''"> and live_address = #{liveAddress} </if>
-		  		  <if test="hobby != null and hobby != ''"> and hobby = #{hobby} </if>
-		  		  <if test="province != null and province != ''"> and province = #{province} </if>
-		  		  <if test="city != null and city != ''"> and city = #{city} </if>
-		  		  <if test="district != null and district != ''"> and district = #{district} </if>
-		  		</where>
+    <select id="list" resultType="com.bootdo.system.domain.UserDO">
+        select
+        `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
+        from sys_user
+        <where>
+            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="username != null and username != ''">and username = #{username}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="password != null and password != ''">and password = #{password}</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="deptIds != null and deptIds.size() > 0">and dept_id in
+                <foreach collection="deptIds" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="email != null and email != ''">and email = #{email}</if>
+            <if test="mobile != null and mobile != ''">and mobile = #{mobile}</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="userIdCreate != null and userIdCreate != ''">and user_id_create = #{userIdCreate}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+            <if test="sex != null and sex != ''">and sex = #{sex}</if>
+            <if test="birth != null and birth != ''">and birth = #{birth}</if>
+            <if test="picId != null and picId != ''">and pic_id = #{picId}</if>
+            <if test="liveAddress != null and liveAddress != ''">and live_address = #{liveAddress}</if>
+            <if test="hobby != null and hobby != ''">and hobby = #{hobby}</if>
+            <if test="province != null and province != ''">and province = #{province}</if>
+            <if test="city != null and city != ''">and city = #{city}</if>
+            <if test="district != null and district != ''">and district = #{district}</if>
+        </where>
         <choose>
             <when test="sort != null and sort.trim() != ''">
                 order by ${sort} ${order}
             </when>
-			<otherwise>
+            <otherwise>
                 order by user_id desc
-			</otherwise>
+            </otherwise>
         </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="count" resultType="int">
-		select count(*) from sys_user
-		 <where>  
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="username != null and username != ''"> and username = #{username} </if>
-		  		  <if test="name != null and name != ''"> and name = #{name} </if>
-		  		  <if test="password != null and password != ''"> and password = #{password} </if>
-		  		  <if test="deptId != null and deptId != ''"> and dept_id = #{deptId} </if>
-		  		  <if test="email != null and email != ''"> and email = #{email} </if>
-		  		  <if test="mobile != null and mobile != ''"> and mobile = #{mobile} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="userIdCreate != null and userIdCreate != ''"> and user_id_create = #{userIdCreate} </if>
-		  		  <if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-		  		  <if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		  		  <if test="sex != null and sex != ''"> and sex = #{sex} </if>
-		  		  <if test="birth != null and birth != ''"> and birth = #{birth} </if>
-		  		  <if test="picId != null and picId != ''"> and pic_id = #{picId} </if>
-		  		  <if test="liveAddress != null and liveAddress != ''"> and live_address = #{liveAddress} </if>
-		  		  <if test="hobby != null and hobby != ''"> and hobby = #{hobby} </if>
-		  		  <if test="province != null and province != ''"> and province = #{province} </if>
-		  		  <if test="city != null and city != ''"> and city = #{city} </if>
-		  		  <if test="district != null and district != ''"> and district = #{district} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.bootdo.system.domain.UserDO" useGeneratedKeys="true" keyProperty="userId">
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="count" resultType="int">
+        select count(*) from sys_user
+        <where>
+            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="username != null and username != ''">and username = #{username}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="password != null and password != ''">and password = #{password}</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="email != null and email != ''">and email = #{email}</if>
+            <if test="mobile != null and mobile != ''">and mobile = #{mobile}</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="userIdCreate != null and userIdCreate != ''">and user_id_create = #{userIdCreate}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+            <if test="sex != null and sex != ''">and sex = #{sex}</if>
+            <if test="birth != null and birth != ''">and birth = #{birth}</if>
+            <if test="picId != null and picId != ''">and pic_id = #{picId}</if>
+            <if test="liveAddress != null and liveAddress != ''">and live_address = #{liveAddress}</if>
+            <if test="hobby != null and hobby != ''">and hobby = #{hobby}</if>
+            <if test="province != null and province != ''">and province = #{province}</if>
+            <if test="city != null and city != ''">and city = #{city}</if>
+            <if test="district != null and district != ''">and district = #{district}</if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.bootdo.system.domain.UserDO" useGeneratedKeys="true" keyProperty="userId">
 		insert into sys_user
 		(
 			`username`, 
@@ -112,44 +119,44 @@
 			#{district}
 		)
 	</insert>
-	 
-	<update id="update" parameterType="com.bootdo.system.domain.UserDO">
-		update sys_user 
-		<set>
-			<if test="username != null">`username` = #{username}, </if>
-			<if test="name != null">`name` = #{name}, </if>
-			<if test="password != null">`password` = #{password}, </if>
-			<if test="deptId != null">`dept_id` = #{deptId}, </if>
-			<if test="email != null">`email` = #{email}, </if>
-			<if test="mobile != null">`mobile` = #{mobile}, </if>
-			<if test="status != null">`status` = #{status}, </if>
-			<if test="userIdCreate != null">`user_id_create` = #{userIdCreate}, </if>
-			<if test="gmtCreate != null">`gmt_create` = #{gmtCreate}, </if>
-			<if test="gmtModified != null">`gmt_modified` = #{gmtModified}, </if>
-			<if test="sex != null">`sex` = #{sex}, </if>
-			<if test="birth != null">`birth` = #{birth}, </if>
-			<if test="picId != null">`pic_id` = #{picId}, </if>
-			<if test="liveAddress != null">`live_address` = #{liveAddress}, </if>
-			<if test="hobby != null">`hobby` = #{hobby}, </if>
-			<if test="province != null">`province` = #{province}, </if>
-			<if test="city != null">`city` = #{city}, </if>
-			<if test="district != null">`district` = #{district}</if>
-		</set>
-		where user_id = #{userId}
-	</update>
-	
-	<delete id="remove">
+
+    <update id="update" parameterType="com.bootdo.system.domain.UserDO">
+        update sys_user
+        <set>
+            <if test="username != null">`username` = #{username},</if>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="password != null">`password` = #{password},</if>
+            <if test="deptId != null">`dept_id` = #{deptId},</if>
+            <if test="email != null">`email` = #{email},</if>
+            <if test="mobile != null">`mobile` = #{mobile},</if>
+            <if test="status != null">`status` = #{status},</if>
+            <if test="userIdCreate != null">`user_id_create` = #{userIdCreate},</if>
+            <if test="gmtCreate != null">`gmt_create` = #{gmtCreate},</if>
+            <if test="gmtModified != null">`gmt_modified` = #{gmtModified},</if>
+            <if test="sex != null">`sex` = #{sex},</if>
+            <if test="birth != null">`birth` = #{birth},</if>
+            <if test="picId != null">`pic_id` = #{picId},</if>
+            <if test="liveAddress != null">`live_address` = #{liveAddress},</if>
+            <if test="hobby != null">`hobby` = #{hobby},</if>
+            <if test="province != null">`province` = #{province},</if>
+            <if test="city != null">`city` = #{city},</if>
+            <if test="district != null">`district` = #{district}</if>
+        </set>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="remove">
 		delete from sys_user where user_id = #{value}
 	</delete>
-	
-	<delete id="batchRemove">
-		delete from sys_user where user_id in 
-		<foreach item="userId" collection="array" open="(" separator="," close=")">
-			#{userId}
-		</foreach>
-	</delete>
 
-	<select id="listAllDept" resultType="long">
+    <delete id="batchRemove">
+        delete from sys_user where user_id in
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <select id="listAllDept" resultType="long">
 				select DISTINCT dept_id from sys_user
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/bootdo/src/main/resources/templates/login.html b/bootdo/src/main/resources/templates/login.html
index 0ebccd29a1636fa68d4e0c5e719c86e8713f489f..4970bf0d0f4ab1893e7921e65bddfe9f59382886 100644
--- a/bootdo/src/main/resources/templates/login.html
+++ b/bootdo/src/main/resources/templates/login.html
@@ -56,9 +56,9 @@
                 <h3 class="text-center">用户登录</h3>
                 <p class="m-t-md text-center">欢迎登录bootdo后台管理系统</p>
                 <input type="text" name="username" class="form-control uname"
-                       value="admin"/>
+                       th:value="${username}"/>
                 <input type="password" name="password"
-                       class="form-control pword m-b" value="111111"/>
+                       class="form-control pword m-b" th:value="${password}"/>
                 <a id="login" class="btn btn-login btn-block">登录</a>
                 <!--按钮模块-->
                 <div class="outside-login">