Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-28 3197e50144b3a33be9a232b324e6d85ffd0e8bfa

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -320,6 +320,13 @@
        {
            return error("账户不能为空");
        }

        if(StringUtils.isEmpty(config.getDepartmentId()))
        {
           return error("请选择部门");
        }

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