diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 0eeaab1e..91506aa4 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -140,7 +140,6 @@ public class SysUserController {
 
         IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
 
-
 		//批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
@@ -347,6 +346,9 @@ public class SysUserController {
         //如果此参数为false则程序发生异常
         result.setResult(true);
         try {
+            // 先给phone和email加密，和数据库能匹配
+            sysUser.setEmail(this.sysUserService.proceedEmailEncrypt(sysUser.getEmail()));
+            sysUser.setPhone(this.sysUserService.proceedPhoneEncrypt(sysUser.getPhone()));
             //通过传入信息查询新的用户信息
             sysUser.setPassword(null);
             SysUser user = sysUserService.getOne(new QueryWrapper<>(sysUser));
@@ -385,9 +387,8 @@ public class SysUserController {
      * @param userId
      * @return
      */
-//    @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
     @GetMapping("/userDepartList")
-    public Results<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
+    public Results<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId") String userId) {
         Results<List<DepartIdModel>> result = new Results<>();
         try {
             List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
@@ -414,7 +415,6 @@ public class SysUserController {
      *
      * @return
      */
-//    @RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
     @GetMapping("/generateUserId")
     public Results<String> generateUserId() {
         Results<String> result = new Results<>();
@@ -431,9 +431,10 @@ public class SysUserController {
      * @param id
      * @return
      */
-//    @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
     @GetMapping("/queryUserByDepId")
-    public Results<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id, @RequestParam(name="realname",required=false) String realname , @RequestParam(name="username",required=false) String username) {
+    public Results<List<SysUser>> queryUserByDepId(@RequestParam(name = "id") String id,
+                                                   @RequestParam(name="realname",required=false) String realname ,
+                                                   @RequestParam(name="username",required=false) String username) {
         Results<List<SysUser>> result = new Results<>();
         SysDepart sysDepart = sysDepartService.getById(id);
         //去除前端传回参数两边的*
@@ -477,7 +478,6 @@ public class SysUserController {
      * @param username
      * @return
      */
-//    @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET)
     @GetMapping("/queryUserComponentData")
     public Results<IPage<SysUser>> queryUserComponentData(
             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -537,7 +537,6 @@ public class SysUserController {
      * @return
      */
     @RequiresPermissions("sys:user:import")
-//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     @PostMapping("/importExcel")
     public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -661,7 +660,6 @@ public class SysUserController {
 	 * @param userIds
 	 * @return
 	 */
-    //@RequiresPermissions("sys:user:list")
     @GetMapping("/queryByIds")
 	public Results<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
 		Results<Collection<SysUser>> result = new Results<>();