Merge remote-tracking branch 'origin/master'

sgj

17 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

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

@@ -5,6 +5,7 @@
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.gropu.GroupManager;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -48,6 +49,9 @@
        Slogan dicSlogan = commonManager.getDicSlogan();
        view.put("dicSlogan", dicSlogan);

        view.put("bizType", "screen");
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);

        //查询库区信息
        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
        view.put("deptList", deptList);
@@ -71,6 +75,10 @@
        Slogan dicSlogan = commonManager.getDicSlogan();
        view.put("dicSlogan", dicSlogan);


        view.put("bizType", "screen");
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);

        //查询库区信息
        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
        view.put("deptList", deptList);
@@ -94,6 +102,9 @@
        Slogan dicSlogan = commonManager.getDicSlogan();
        view.put("dicSlogan", dicSlogan);

        view.put("bizType", "screen");
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);

        view.put("defaultAreaCode", "650000");

        //获取新疆区划信息