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

lidongdong

2022-11-25 01b70437d4ef3348e69b2af0dcbd7250e1234117

 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);
            }
@@ -149,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);
        }
@@ -307,8 +308,6 @@
        {
            return error("账户不能为空");
        }

        config.setUserType("3");

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