Merge remote-tracking branch 'origin/master'

sgj

22 小时以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java

@@ -82,14 +82,6 @@
        mmap.put("user", user);
        mmap.put("sysName", FrameworkConfig.getName());

        //判断是否显示库区选择弹窗
        String showDeptList = "Y";
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
            showDeptList = "N";
        }
        mmap.put("showDeptList", showDeptList);

        ContextUtil.updateSubDept(user.getLoginName(), deptId);
        SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
        mmap.put("dept", dept);