修改后台账户 修改信息以后登录密码改变

lidongdong

2022-11-25 b3bc52d303a62b67791f193b6e84306f6462c3db

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -59,7 +59,7 @@
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
            HuaChengSysUser huaChengSysUser=null;

            if(list!=null || list.size()>0 )
            if(list!=null && list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }
@@ -113,6 +113,7 @@
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            map.put("moreDepartmentIds", user.getMoreDepartmentIds());

            return ResultData.success(map);
        }
@@ -148,6 +149,7 @@
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            map.put("moreDepartmentIds", user.getMoreDepartmentIds());

            return ResultData.success(map);
        }
@@ -195,9 +197,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        int num=IUserService.selectNum(null,keyword,null,"1");
        return getDataTable(list,num);
    }

@@ -248,6 +250,12 @@
                config.setUserType("3");
                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                config.setMasterIds(user2.getMasterIds());
                config.setDepartmentIds(config.getDepartmentIds());
                config.setDepartmentIdStr(config.getDepartmentIdStr());
                config.setMattersIds(config.getMattersIds());
                config.setMasterNames(config.getMasterNames());
                config.setMattersNames(config.getMattersNames());
                return toAjax(IUserService.updateConfig(config));
            }
            else
@@ -266,6 +274,12 @@
                config.setUserType("3");
                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                config.setMasterIds(user2.getMasterIds());
                config.setDepartmentIds(config.getDepartmentIds());
                config.setDepartmentIdStr(config.getDepartmentIdStr());
                config.setMattersIds(config.getMattersIds());
                config.setMasterNames(config.getMasterNames());
                config.setMattersNames(config.getMattersNames());
                return toAjax(IUserService.updateConfig(config));
            }
            else
@@ -279,7 +293,7 @@
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");
        config.setIsDivisionHead("1");

        config.setMoreDepartmentIds(config.getDepartmentId());
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());

@@ -306,9 +320,7 @@
        {
            return error("账户不能为空");
        }

        config.setUserType("3");

        config.setPassword(null);
        config.setUpdateBy(sys.getUserId()+"");

        return toAjax(IUserService.updateConfig(config));
@@ -396,7 +408,7 @@
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员  isDivisionHead=1 为部门领导",response = SysUser.class)
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
@@ -407,5 +419,15 @@



    @ApiOperation("切换部门接口")
    @GetMapping(value = "/switch/department")
    public ResultData switchDepartment(@RequestParam(value = "departmentId",required = false) String departmentId,
                                       @CurrentUser SysUser sysUse)
    {
        sysUse.setDepartmentId(departmentId);
        return toAjax(IUserService.updateConfig(sysUse));
    }



}