提交代码

Pu Zhibing

9 天以前 30f124fbe2c638eecda3d74c6dde053af5d574f0

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java

@@ -71,7 +71,7 @@
     */
    @RequestMapping("")
    public String index(Model model) {
        model.addAttribute("userType", Objects.requireNonNull(ShiroKit.getUser()).getRoleType());
        model.addAttribute("userType", Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType());
        return PREFIX + "tBranchOffice.html";
    }

@@ -674,6 +674,7 @@
        if (SinataUtil.isNotEmpty(tBranchOffice.getAccount()) && SinataUtil.isNotEmpty(tBranchOffice.getPassword())){
            if(Objects.isNull(user)){
                //添加User对象
                user = new User();
                user.setAccount(tBranchOffice.getAccount());
                user.setSalt(ShiroKit.getRandomSalt(5));
                user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));